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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

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

@@ -101,6 +101,12 @@
   @ApiModelProperty(value = "部位")
   @TableField(value = "\"part_place\"", fill = FieldFill.UPDATE)
   private String partPlace;
   /**
    * 部位
    */
   @ApiModelProperty(value = "部位描述")
   @TableField(value = "\"part_place_info\"", fill = FieldFill.UPDATE)
   private String partPlaceInfo;

   /**
    * 普查面积
@@ -124,9 +130,9 @@
   private String investigationWay;

   /**
    * 危害等级
    * 危害情况
    */
   @ApiModelProperty(value = "危害等级")
   @ApiModelProperty(value = "危害情况")
   @TableField(value = "\"hazard_rating\"", fill = FieldFill.UPDATE)
   private String hazardRating;