Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/EventAttrController.java

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/EventAttrController.java

@@ -87,7 +87,6 @@ public class EventAttrController extends JeecgController<EventAttr, IEventAttrSe
      */
     @AutoLog(value = "event_attr-添加")
     @ApiOperation(value = "event_attr-添加", notes = "event_attr-添加")
-//    @RequiresPermissions("medical:event_attr:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody EventAttr eventAttr) {
         eventAttrService.save(eventAttr);
@@ -102,7 +101,6 @@ public class EventAttrController extends JeecgController<EventAttr, IEventAttrSe
      */
     @AutoLog(value = "event_attr-编辑")
     @ApiOperation(value = "event_attr-编辑", notes = "event_attr-编辑")
-//    @RequiresPermissions("medical:event_attr:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody EventAttr eventAttr) {
         eventAttrService.updateById(eventAttr);
@@ -117,7 +115,6 @@ public class EventAttrController extends JeecgController<EventAttr, IEventAttrSe
      */
     @AutoLog(value = "event_attr-通过id删除")
     @ApiOperation(value = "event_attr-通过id删除", notes = "event_attr-通过id删除")
-//    @RequiresPermissions("medical:event_attr:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         eventAttrService.removeById(id);
@@ -132,7 +129,6 @@ public class EventAttrController extends JeecgController<EventAttr, IEventAttrSe
      */
     @AutoLog(value = "event_attr-批量删除")
     @ApiOperation(value = "event_attr-批量删除", notes = "event_attr-批量删除")
-//    @RequiresPermissions("medical:event_attr:deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.eventAttrService.removeByIds(Arrays.asList(ids.split(",")));
@@ -162,7 +158,6 @@ public class EventAttrController extends JeecgController<EventAttr, IEventAttrSe
      * @param request
      * @param eventAttr
      */
-    @RequiresPermissions("medical:event_attr:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, EventAttr eventAttr) {
         return super.exportXls(request, eventAttr, EventAttr.class, "event_attr");
@@ -175,7 +170,6 @@ public class EventAttrController extends JeecgController<EventAttr, IEventAttrSe
      * @param response
      * @return
      */
-    @RequiresPermissions("medical:event_attr:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, EventAttr.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/FactorEnchanceController.java

@@ -201,7 +201,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
      */
     @AutoLog(value = "factor_enchance-批量删除")
     @ApiOperation(value = "factor_enchance-批量删除", notes = "factor_enchance-批量删除")
-    @RequiresPermissions("medical:factor_enchance:deleteBatch")
+//    @RequiresPermissions("medical:factor_enchance:deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.factorEnchanceService.removeByIds(Arrays.asList(ids.split(",")));
@@ -248,7 +248,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
      * @param response
      * @return
      */
-    @RequiresPermissions("medical:factor_enchance:importExcel")
+//    @RequiresPermissions("medical:factor_enchance:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, FactorEnchance.class);