Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java

@@ -75,7 +75,6 @@
        }
    }


    /**
     * 获取当前模块下的子模块
     * @return

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SecretGradeController.java

@@ -27,18 +27,13 @@
    private SecretGradeServiceI secretGradeServiceI;

    /**
     * 日志
     */
    private Logger logger = LoggerFactory.getLogger(getClass());

    /**
     * 获取密级管理配置
     * @return
     */
    @GetMapping("/getSecretGradeConfig")
    public BaseResult getSecretGradeConfig(){
        try {
            return BaseResult.dataList(secretGradeServiceI.getSecretGradeConfig());
            return BaseResult.success(secretGradeServiceI.getSecretGradeConfig());
        } catch (PLException e) {
            BaseResult objectBaseResult = new BaseResult<>();
            objectBaseResult.setCode(Integer.parseInt(e.code));
@@ -52,9 +47,9 @@
     * @param secretGradeMap
     * @return
     */
    @PostMapping( "/secretGradeServiceI")
    @VciBusinessLog(operateName = "添加属性")
    public BaseResult saveSecretGrade(Map<String, Boolean> secretGradeMap) {
    @PostMapping( "/saveSecretGrade")
    @VciBusinessLog(operateName = "用户/机器密级停启配置保存")
    public BaseResult saveSecretGrade(@RequestBody Map<String, Boolean> secretGradeMap) {
        return secretGradeServiceI.saveSecretGrade(secretGradeMap);
    }