Merge remote-tracking branch 'origin/master'

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -257,7 +257,7 @@ public class SysUserController extends BaseController
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user)
     {
-        userService.checkUserAllowed(user);
+        //userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -47,16 +47,13 @@ public class VaccineInfoController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 导出疫苗信息列表
-     */
-    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:export')")
-    @Log(title = "疫苗信息", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(HttpServletResponse response, VaccineInfoOperation vaccineInfo) throws IOException {
+    @Log(title = "导出疫苗信息", businessType = BusinessType.EXPORT)
+    @PreAuthorize(hasPermi = "core:info:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, VaccineInfoOperation vaccineInfo) throws IOException  {
         List<VaccineInfoOperation> list = vaccineInfoService.selectVaccineInfoList(vaccineInfo);
         ExcelUtil<VaccineInfoOperation> util = new ExcelUtil<VaccineInfoOperation>(VaccineInfoOperation.class);
-        util.exportExcel(response, list, "info");
+        util.exportExcel(response, list, "疫苗信息");
     }
 
     /**