1.调整水表档案和用户档案实体类，增加@FieldDesc注释

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/bjgl/entity/YhCbkxx.java

@@ -10,6 +10,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.tofly.feesapi.common.constant.FmztEnum;
+import com.tofly.feesapi.common.util.FieldDesc;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,228 +25,287 @@ public class YhCbkxx implements Serializable {
 
     @ApiModelProperty("ID号，唯一")
     @TableId(type = IdType.INPUT)
+    @FieldDesc("ID号")
     private String cbkid;
 
     @ApiModelProperty("用户编号")
+    @FieldDesc("用户编号")
     private String yhbh;
 
     @ApiModelProperty("抄表卡号")
+    @FieldDesc("抄表卡号")
     private String cbkh;
 
     @ApiModelProperty("水表类别(bm_sblb)")
+    @FieldDesc("水表类别")
     private String sblb;
 
     @ApiModelProperty("水表生产厂家(bm_sbsccj)")
+    @FieldDesc("水表生产厂家")
     private String sbsccj;
 
     @ApiModelProperty("水表出厂日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonIgnore
+    @FieldDesc("水表出厂日期")
     private Date sbccrq;
 
     @ApiModelProperty("水表型号(bm_sbxh)")
+    @FieldDesc("水表型号")
     private String sbxh;
 
     @ApiModelProperty("水表口径(sys_child_code,pcid='12')")
+    @FieldDesc("水表口径")
     private String sbkj;
 
     @ApiModelProperty("水表编号")
+    @FieldDesc("水表编号")
     private String sbbh;
 
     @ApiModelProperty("水表量程(sys_child_code,pcid='13')")
+    @FieldDesc("水表量程")
     private String sblc;
 
     @ApiModelProperty("表计位置(sys_child_code,pcid='15')")
+    @FieldDesc("表计位置")
     private String bjwz;
 
     @ApiModelProperty("精度等级(sys_child_code,pcid='14')")
+    @FieldDesc("精度等级")
     private String jddj;
 
     @ApiModelProperty("抄表频率")
+    @FieldDesc("抄表频率")
     private String cbpl;
 
     @ApiModelProperty("水表起数（底数）")
+    @FieldDesc("水表起数")
     private int sbqs = 0;
 
     @ApiModelProperty("抄表序号")
+    @FieldDesc("抄表序号")
     private int cbxh;
 
     @ApiModelProperty("一表多价标志")
+    @FieldDesc("一表多价标志")
     private String ybdjbz;
 
     @ApiModelProperty("水价编码")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+    @FieldDesc("水价编码")
     private String sjbm;
 
     @ApiModelProperty("水量比例")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.NUMERIC)
+    @FieldDesc("水量比例")
     private BigDecimal slbl;
 
     @ApiModelProperty("水价编码1")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+    @FieldDesc("水价编码1")
     private String sjbm1;
 
     @ApiModelProperty("水量比例1")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.NUMERIC)
+    @FieldDesc("水量比例1")
     private BigDecimal slbl1;
 
     @ApiModelProperty("水价编码2")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+    @FieldDesc("水价编码2")
     private String sjbm2;
 
     @ApiModelProperty("水量比例2")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.NUMERIC)
+    @FieldDesc("水量比例2")
     private BigDecimal slbl2;
 
     @ApiModelProperty("水价编码3")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+    @FieldDesc("水价编码3")
     private String sjbm3;
 
     @ApiModelProperty("水量比例3")
-    //@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.NUMERIC)
+    @FieldDesc("水量比例3")
     private BigDecimal slbl3;
 
     @ApiModelProperty("污水费标志")
+    @FieldDesc("污水费标志")
     private String wsfbz;
 
     @ApiModelProperty("总分表ID（yh_cbkxx.cbkid）")
+    @FieldDesc("总分表ID")
     private String fbid;
 
     @ApiModelProperty("备注")
+    @FieldDesc("备注")
     private String bz;
 
     @ApiModelProperty("计费状态（1正常，2停用）")
+    @FieldDesc("计费状态")
     private String jfzt;
 
     @ApiModelProperty("开卡标志（bm_kkzt）")
+    @FieldDesc("开卡标志")
     private String kkbz;
 
     @ApiModelProperty("开卡日期")
+    @FieldDesc("开卡日期")
     private Date kkrq;
 
     @ApiModelProperty("IC卡ID")
+    @FieldDesc("IC卡ID")
     private String ickid;
 
     @ApiModelProperty("写卡次数")
+    @FieldDesc("写卡次数")
     private Short xkcs;
 
     @ApiModelProperty("补卡次数")
+    @FieldDesc("补卡次数")
     private Short bkcs;
 
     @ApiModelProperty("总购水量")
+    @FieldDesc("总购水量")
     private Long zgsl;
 
     @ApiModelProperty("总购水金额（金额表）")
+    @FieldDesc("总购水金额")
     private BigDecimal zgsje;
 
     @ApiModelProperty("本年累计水量")
+    @FieldDesc("本年累计水量")
     private BigDecimal bnljsl;
 
     @ApiModelProperty("本年累计金额")
+    @FieldDesc("本年累计金额")
     private BigDecimal bnljje;
 
     @ApiModelProperty("操作人员编码")
+    @FieldDesc("操作人员编码")
     private String czrybm;
 
     @ApiModelProperty("操作人员姓名")
+    @FieldDesc("操作人员姓名")
     private String czryxm;
 
     @ApiModelProperty("操作时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("操作时间")
     private Date czsj;
 
     @ApiModelProperty("最新抄表日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("最新抄表日期")
     private Date zxcbrq;
 
     @ApiModelProperty("所属阀门(sys_child_code,pcid='23')")
+    @FieldDesc("所属阀门")
     private String ssfm;
 
+    @FieldDesc("IC卡启用号")
     private Short ickqyh;
 
     @ApiModelProperty("定检日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("定检日期")
     private Date djrq;
 
     @ApiModelProperty("水表止读")
+    @FieldDesc("水表止读")
     private Long sbzd;
 
     @ApiModelProperty("修改人员编码")
+    @FieldDesc("修改人员编码")
     private String xgrybm;
 
     @ApiModelProperty("修改日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("修改日期")
     private Date xgrq;
 
     @ApiModelProperty("超定量")
+    @FieldDesc("超定量")
     private Long cdl;
 
     @ApiModelProperty("两高一剩标志:0 否，1 是")
+    @FieldDesc("两高一剩标志")
     private String lgysbz;
 
     @ApiModelProperty("安装人员")
+    @FieldDesc("安装人员")
     private String azry;
 
     @ApiModelProperty("安装时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("安装时间")
     private Date azrq;
 
     @ApiModelProperty("铅封号(管线号)")
+    @FieldDesc("铅封号")
     private String gxh;
 
     @ApiModelProperty("垃圾费收取方式:0按户收取，1 按用量收取")
+    @FieldDesc("垃圾费收取方式")
     private String ljffs;
 
     @ApiModelProperty("垃圾费金额")
+    @FieldDesc("垃圾费金额")
     private BigDecimal ljfje;
 
     @ApiModelProperty("垃圾费标志")
+    @FieldDesc("垃圾费标志")
     private String ljfbz;
 
     @ApiModelProperty("IC 卡no")
+    @FieldDesc("IC卡号")
     private String ickno;
 
     @ApiModelProperty("累计水量")
+    @FieldDesc("累计水量")
     private BigDecimal ljsl = BigDecimal.ZERO;
 
     @ApiModelProperty("智能表剩余金额")
+    @FieldDesc("智能表剩余金额")
     private BigDecimal syje = BigDecimal.ZERO;
 
     @ApiModelProperty("阀门状态(0关阀 1处理中 2开阀)")
+    @FieldDesc("阀门状态")
     private FmztEnum fmzt;
 
     @ApiModelProperty("用水类型")
+    @FieldDesc("用水类型")
     private String yslx;
 
-    //@ApiModelProperty("水表用途(户表，临时表，考核表，泳池表，消防表)")
     @ApiModelProperty("水表用途(1户表，2临时表，3总表,4考核表，5子表，6母表，7总母表)")
+    @FieldDesc("水表用途")
     private String sbyt;
 
     @ApiModelProperty("水表安装方式：0为立式，1为卧式")
+    @FieldDesc("水表安装方式")
     private String sbazfs;
 
     @ApiModelProperty("水资源费标志")
+    @FieldDesc("水资源费标志")
     private String szyfbz;
 
     @ApiModelProperty("水表状态")
+    @FieldDesc("水表状态")
     private String sbzt;
 
     @ApiModelProperty("消防通表号")
+    @FieldDesc("消防通表号")
     private String xftbh;
 
     @ApiModelProperty("附加费")
+    @FieldDesc("附加费")
     private BigDecimal fjf;
 
     @ApiModelProperty("消防栓费")
+    @FieldDesc("消防栓费")
     private BigDecimal xfsf;
 
     @ApiModelProperty("二次加压费")
+    @FieldDesc("二次加压费")
     private String ecjybz;
 
     @Override

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/yhgl/entity/YhKhjbxx.java

@@ -11,6 +11,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tofly.feesapi.common.constant.YhztEnum;
+import com.tofly.feesapi.common.util.FieldDesc;
 import com.tofly.feesapi.file.entity.File;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,243 +30,320 @@ public class YhKhjbxx extends Model<YhKhjbxx> {
 
     @ApiModelProperty("用户编号")
     @TableId(value = "yhbh", type = IdType.INPUT)
+    @FieldDesc("用户编号")
     private String yhbh;
 
     @ApiModelProperty("原用户号")
+    @FieldDesc("原用户号")
     private String ykhbh;
 
     @ApiModelProperty("所属公司")
+    @FieldDesc("所属公司")
     private String ssgs;
 
     @ApiModelProperty("所属抄表片区")
+    @FieldDesc("所属抄表片区")
     private String sscbpq;
 
     @ApiModelProperty("所属抄表本")
+    @FieldDesc("所属抄表本")
     private String sscbb;
 
     @ApiModelProperty("申请日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("申请日期")
     private Date sqrq;
 
     @ApiModelProperty("用户姓名")
+    @FieldDesc("用户姓名")
     private String yhxm;
 
     @ApiModelProperty("用户地址")
+    @FieldDesc("用户地址")
     private String yhdz;
 
     @ApiModelProperty("联系电话")
+    @FieldDesc("联系电话")
     private String lxdh;
 
     @ApiModelProperty("用户数")
+    @FieldDesc("用户数")
     private Long rks;
 
     @ApiModelProperty("性别（1男，2女，3未知）[sys_child_code,pcid='9']")
+    @FieldDesc("性别")
     private String xb;
 
     @ApiModelProperty("手机")
+    @FieldDesc("手机")
     private String sj;
 
     @ApiModelProperty("住宅电话")
+    @FieldDesc("住宅电话")
     private String zzdh;
 
     @ApiModelProperty("工作单位")
+    @FieldDesc("工作单位")
     private String gzdw;
 
     @ApiModelProperty("办公电话")
+    @FieldDesc("办公电话")
     private String bgdh;
 
     @ApiModelProperty("电子邮箱")
+    @FieldDesc("电子邮箱")
     private String dzyx;
 
     @ApiModelProperty("证件类别(sys_child_code,pcid='10')")
+    @FieldDesc("证件类别")
     private String zjlb;
 
     @ApiModelProperty("证件号码")
+    @FieldDesc("证件号码")
     private String zjhm;
 
     @ApiModelProperty("与户主关系")
+    @FieldDesc("与户主关系")
     private String hzgx;
 
     @ApiModelProperty("用户状态（0:申请用户,1:正式用户,2:报停用户,3:销户用户,4:作废用户）")
+    @FieldDesc("用户状态")
     private YhztEnum yhzt;
 
     @ApiModelProperty("重视级别")
+    @FieldDesc("重视级别")
     private String zsjb;
 
     @ApiModelProperty("建档日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("建档日期")
     private Date jdrq;
 
     @ApiModelProperty("通水标志（0：未开通，1：已开通）")
+    @FieldDesc("通水标志")
     private String tsbz;
 
     @ApiModelProperty("通水日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("通水日期")
     private Date tsrq;
 
     @ApiModelProperty("合同签订")
+    @FieldDesc("合同签订")
     private String htqd;
 
     @ApiModelProperty("合同签订日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("合同签订日期")
     private Date htqdrq;
 
     @ApiModelProperty("合同编号")
+    @FieldDesc("合同编号")
     private String htbh;
 
     @ApiModelProperty("备注")
+    @FieldDesc("备注")
     private String bz;
 
     @ApiModelProperty("备注1")
+    @FieldDesc("备注1")
     private String bz1;
 
     @ApiModelProperty("报装_工程编号")
+    @FieldDesc("报装工程编号")
     private String bzGcbh;
 
     @ApiModelProperty("报装_批次序列号")
+    @FieldDesc("报装批次序列号")
     private String bzPcxlh;
 
     @ApiModelProperty("操作人员编码")
+    @FieldDesc("操作人员编码")
     private String czrybm;
 
     @ApiModelProperty("操作人员姓名")
+    @FieldDesc("操作人员姓名")
     private String czryxm;
 
     @ApiModelProperty("操作时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @FieldDesc("操作时间")
     private Date czsj;
 
     @ApiModelProperty("身份证图片")
+    @FieldDesc("身份证图片")
     private String psfz;
 
     @ApiModelProperty("合同图片")
+    @FieldDesc("合同图片")
     private String pht;
 
     @ApiModelProperty("工商执照图片")
+    @FieldDesc("工商执照图片")
     private String pgszz;
 
     @ApiModelProperty("房产证图片")
+    @FieldDesc("房产证图片")
     private String pfcz;
 
     @ApiModelProperty("营业执照图片")
+    @FieldDesc("营业执照图片")
     private String pyyzz;
 
     @ApiModelProperty("有效证件图片")
+    @FieldDesc("有效证件图片")
     private String pyxzj;
 
     @ApiModelProperty("信用等级（sys_child_code,pcid='20'）")
+    @FieldDesc("信用等级")
     private String xydj;
 
     @ApiModelProperty("是否特困户（1是，0否）")
+    @FieldDesc("是否特困户")
     private String tkhbz;
 
     @ApiModelProperty("职位")
+    @FieldDesc("职位")
     private String zw;
 
     @ApiModelProperty("建档人员编码")
+    @FieldDesc("建档人员编码")
     private String jdrybm;
 
     @ApiModelProperty("建档人员姓名")
+    @FieldDesc("建档人员姓名")
     private String jdryxm;
 
     @ApiModelProperty("建档批次序列号")
+    @FieldDesc("建档批次序列号")
     private String jdpcxlh;
 
     @ApiModelProperty("发票类型: 0-手册，1-普票，2-专票，3-收据")
+    @FieldDesc("发票类型")
     private String fplx;
 
     @ApiModelProperty("是否取整")
+    @FieldDesc("是否取整")
     private String sfqz;
 
     @ApiModelProperty("抄表人员姓名")
+    @FieldDesc("抄表人员姓名")
     private String cbryxm;
 
+    @FieldDesc("序号")
     private Long xh;
 
     @ApiModelProperty("所属行政规划")
+    @FieldDesc("所属行政规划")
     private String ssregion;
 
     @ApiModelProperty("修改人员")
+    @FieldDesc("修改人员")
     private String xgrybm;
 
     @ApiModelProperty("发票开具姓名")
+    @FieldDesc("发票开具姓名")
     private String fpName;
 
     @ApiModelProperty("发票开具纳税人识别号")
+    @FieldDesc("发票开具纳税人识别号")
     private String fpNsrsbh;
 
     @ApiModelProperty("发票开具地址")
+    @FieldDesc("发票开具地址")
     private String fpDz;
 
     @ApiModelProperty("发票开具联系电话")
+    @FieldDesc("发票开具联系电话")
     private String fpLxdh;
 
     @ApiModelProperty("发票开具开户行")
+    @FieldDesc("发票开具开户行")
     private String fpBankname;
 
     @ApiModelProperty("发票开具银行账号")
+    @FieldDesc("发票开具银行账号")
     private String fpBankcode;
 
     @ApiModelProperty("发票开具备注")
+    @FieldDesc("发票开具备注")
     private String fpBz;
 
     @ApiModelProperty("收费方式")
+    @FieldDesc("收费方式")
     private String fffs;
 
     @ApiModelProperty("年度累计量")
+    @FieldDesc("年度累计量")
     private BigDecimal jtzqljl;
 
     @ApiModelProperty("客户类型（弱势群体，残疾，正常，低保，企业，服务）")
+    @FieldDesc("客户类型")
     private String khlb;
 
     @ApiModelProperty("拼音简码")
+    @FieldDesc("拼音简码")
     private String pyjm;
 
     @ApiModelProperty("月累积量")
+    @FieldDesc("月累积量")
     private BigDecimal yljl;
 
     @ApiModelProperty("水表数量")
+    @FieldDesc("水表数量")
     private Integer sbsl;
 
     @ApiModelProperty("是否开票")
+    @FieldDesc("是否开票")
     private String sfkp;
 
     @ApiModelProperty("是否免税")
+    @FieldDesc("是否免税")
     private String sfms;
 
     @ApiModelProperty("推送方式-1不推送，0邮箱 1手机 2邮箱、手机")
+    @FieldDesc("推送方式")
     private String pushmode;
 
     @ApiModelProperty("购方邮箱")
+    @FieldDesc("购方邮箱")
     private String email;
 
     @ApiModelProperty("低保户年度累计量")
+    @FieldDesc("低保户年度累计量")
     private BigDecimal dbhndljl;
 
     @ApiModelProperty("客户编码")
+    @FieldDesc("客户编码")
     private String khbm;
 
     @ApiModelProperty("大小户 0-小户 1-大户")
+    @FieldDesc("大小户")
     private Integer dxh;
 
     @ApiModelProperty("主户标志(大户下有多个水表，主户是用于统一收费、开票信息的唯一对象) 0-否 1-是")
+    @FieldDesc("主户标志")
     private Integer zhbz;
 
     @ApiModelProperty("曾用名,多个曾用名用','分隔")
+    @FieldDesc("曾用名")
     private String cym;
 
     @ApiModelProperty("用水地址")
+    @FieldDesc("用水地址")
     private String ysdz;
 
     @ApiModelProperty("累计量清零时间")
+    @FieldDesc("累计量清零时间")
     private String jtljlqcsj;
 
     @ApiModelProperty("物业标志（0未非物业，1为物业）")
+    @FieldDesc("物业标志")
     private String wybz;
 
     @Override