Merge remote-tracking branch 'origin/dev_qr_code' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java

@@ -102,7 +102,7 @@ public class BarcodeUtils {
         Graphics2D g = outImage.createGraphics();
         g.drawImage(image, 0, 0, imageW, imageH, null);
         g.setColor(QRCOLOR);
-        g.setFont(new Font("宋体", Font.BOLD, FONTSIZE));
+        g.setFont(new Font("微软雅黑", Font.BOLD, FONTSIZE));
         g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g.setBackground(Color.white);
 //        获取文字数量  按照字节展示

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java

@@ -33,7 +33,7 @@ public class CollectListResultDTO implements Serializable {
     /**
      * 房屋类型，1:自有, 0:租住
      */
-    private Integer houseType;
+    private String houseType;
 
     /**
      * 居住人数
@@ -45,7 +45,7 @@ public class CollectListResultDTO implements Serializable {
     public CollectListResultDTO() {
         this.houseHolderName = "";
         this.address = "";
-        this.houseType = 0;
+        this.houseType = "0";
         this.totalResi = 0;
         this.list = new ArrayList<>();
     }
@@ -70,7 +70,7 @@ public class CollectListResultDTO implements Serializable {
         /**
          * 核酸检测次数
          */
-        private Integer heSuanCount;
+        private String heSuanCount;
 
         /**
          * 疫苗是否全程接种，1：全程接种，2：未全程接种，3：为接种
@@ -81,7 +81,7 @@ public class CollectListResultDTO implements Serializable {
             this.memberName = "";
             this.memberIdNum = "";
             this.memberMobile = "";
-            this.heSuanCount = 0;
+            this.heSuanCount = "0";
             this.ymjz = 0;
         }
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java

@@ -21,7 +21,7 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
     IcResiCollectEntity selectByAddress(String address);
 
     int updateRec(@Param("id") String id,
-                  @Param("houseType") Integer houseType,
+                  @Param("houseType") String houseType,
                   @Param("houseHolderName") String houseHolderName,
                   @Param("totalResi") Integer totalResi);