Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java

@@ -29,4 +29,5 @@
    List<ZSecret> selectByCondition();


    AjaxResult listType();
}