Merge remote-tracking branch 'origin/master'

sgj

2 天以前 18127822f3cdb4778fb62ba0304bb8372dada516

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java

@@ -7,7 +7,6 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ShiroUtils;