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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/dto/AttResBaseUserDTO.java

@@ -185,10 +185,29 @@
    */
   @ApiModelProperty(value = "巡查责任人-职务")
   private String patrolPosition;

   /**
    * 巡查责任人-所属单位
    */
   @ApiModelProperty(value = "巡查责任人-所属单位")
   private String patrolUnitName;

   /**
    * 市州名称
    */
   @ApiModelProperty(value = "市州名称")
   private String cityName;

   /**
    * 区县名称
    */
   @ApiModelProperty(value = "区县名称")
   private String countyName;

   /**
    * 乡镇名称
    */
   @ApiModelProperty(value = "乡镇名称")
   private String townName;

}