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

guoshilong

2023-04-23 fe3996e9c4f4236d39f8ef468586c31a8a532d55

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

@@ -58,6 +58,6 @@
    */
   @ApiModelProperty(value = "水库id")
   @TableField("\"res_guid\"")
   private String res_guid;
   private String resGuid;

}