Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

@@ -27,4 +27,7 @@

    AjaxResult mySave(ZProperty zProperty);

    List<ZProperty> selectByCondition();

    AjaxResult listType();
}