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

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

@@ -32,7 +32,7 @@ public class CollectListExcelResultDTO implements Serializable {
     /**
      * 房屋类型，1:自有, 0:租住
      */
-    @Excel(name = "房屋类型",replace = { "自有_1", "租住_2"}, width = 30, needMerge = true)
+    @Excel(name = "房屋类型",replace = { "自有_1", "租住_0"}, width = 30, needMerge = true)
     private String houseType;
 
     /**

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

@@ -42,7 +42,7 @@ public class CollectListMemberExcelResultDTO implements Serializable {
     /**
      * 疫苗是否全程接种，1：全程接种，2：未全程接种，3：为接种
      */
-    @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_3" }, width = 30)
+    @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_0" }, width = 30)
     private String ymjz;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java

@@ -91,7 +91,7 @@ public class IcResiCollectController {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setPage(false);
         PageData<CollectListResultDTO> collectList = icResiCollectService.getCollectList(formDTO);
-        List<CollectListExcelResultDTO> list = ConvertUtils.sourceToTarget(collectList.getList(),CollectListExcelResultDTO.class);
+        List<CollectListExcelResultDTO> list =new ArrayList<>();
 
         collectList.getList().forEach(o->{
             List<CollectListMemberExcelResultDTO> children = new ArrayList<>();