Merge remote-tracking branch 'origin/master'

feige

2024-10-07 de1823591a01addd54cb1aab4d78397dcb020472

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

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

    AjaxResult mySave(ZProperty zProperty);

    List<ZProperty> selectByCondition();

    AjaxResult listType();
}