Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryItemController.java

@@ -570,7 +570,7 @@ public class SalaryItemController extends BladeController {
 	/**
 	 * 导入岗位补贴模板
 	 */
-	@GetMapping("/export/vacationExcel")
+	@GetMapping("/export/postAllowance")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导入模板-工资管理-小学部-岗位补贴模板")
 	public void exportPostAllowance(HttpServletResponse response) {
@@ -581,7 +581,7 @@ public class SalaryItemController extends BladeController {
 	 * 导入-工资管理-小学部-岗位补贴导入
 	 *
 	 * */
-	@PostMapping("/import/vacationExcel")
+	@PostMapping("/import/postAllowance")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入-工资管理-小学部-岗位补贴导入", notes = "传入excel")
 	public R importPostAllowance(@RequestParam("file") MultipartFile file,@RequestParam("id") Long id)