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

guoshilong

2023-11-28 ae37e30dcf71113f69d11fbe7cfef389a1fb9a01

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResStagChar.java

@@ -37,6 +37,7 @@
    * 水库编码
    */
   @ApiModelProperty(value = "水库编码")
   @TableField("\"res_guid\"")
   private String resGuid;

   /**