draw 导出地址

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/dto/SweetActivityDrawExcelListDao.java

@@ -34,7 +34,7 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
     private String receivingPhone;
 
     @Excel(name = "收货地址")
-    private String receivingAddress;
+    private String receivingAddressAll;
 
     @Excel(name = "发放状态")
     private String receivingStatusName;
@@ -83,7 +83,7 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
         this.setNickname(source.getNickname());
         this.setReceivingName(source.getReceivingName());
         this.setReceivingPhone(source.getReceivingPhone());
-        this.setReceivingAddress(source.getReceivingAddress());
+        this.setReceivingAddressAll(source.getReceivingAddressAll());
         if (source.getReceivingStatus() == 2) {
             this.setReceivingStatusName("已发放");
         } else {

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetActivityDrawListDao.java

@@ -101,6 +101,7 @@ public class SweetActivityDrawListDao implements Serializable {
      * adam收货人完整地址 空格隔离省市区详细地址
      */
     private String receivingAddress;
+    private String receivingAddressAll;
 
     /**
      * 发放状态 1未发放 2已发放 3无需发放

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityDrawMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectExcelList" resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
         select a.*, CONCAT(a.receiving_province,a.receiving_city,a.receiving_county,a.receiving_address) as
-        receiving_address,
+        receiving_address_all,
         u.mobile
         from sweet_integral_activity_draw as a
         left join sweet_integral_activity_prize as b on b.prize_id = a.prize_id