Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/MaterialsManageVO.java

@@ -7,6 +7,16 @@
public class MaterialsManageVO extends MaterialsManage {

   /**
    * 水库注册码
    */
   private String resRegCode;

   /**
    * 工程规模
    */
   private String engScal;

   /**
    * 市名
    */
   private String cityName;