Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/aqgqj/SzgqjServiceApplication.java

@@ -16,7 +16,7 @@ import org.springframework.web.socket.config.annotation.EnableWebSocket;
 @Slf4j
 @EnableFormValidator
 @EnableWebSocket
-@MapperScan("com.bonus.aqgqj.*.mapper,com.bonus.zhly.dao,com.bonus.aqgqj.*.dao")
+@MapperScan("com.bonus.aqgqj.*.mapper,com.bonus.aqgqj.*.dao")
 public class SzgqjServiceApplication {
 
 

src/main/java/com/bonus/aqgqj/advice/PermissionService.java

@@ -86,7 +86,6 @@ public class PermissionService {
             sysLogs.setParams(params);
             SysMenuVo sysMenuVo=menuService.getMenuModel(permission);
             if(sysMenuVo!=null){
-
                 sysLogs.setOperatorDetail(sysMenuVo.getMenuName());//操作详情
                 sysLogs.setOperatorModel(sysMenuVo.getPMenuName()+"-"+sysMenuVo.getPName());//操作模块
                 sysLogs.setOperatorType(sysMenuVo.getMenuName());//操作类型 怎删改查