Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 519df7e3 e3648560
Showing 3 changed files with 9 additions and 0 deletions
fw-valhalla-dao/src/main/resources/mapper/StammkundePoolMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/StammkundePoolDTO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/StammkundePoolVO.java
@@ -23,6 +23,7 @@
         t1.new_shop_name                                                                                new_shop_name,
         t3.name                                                                                         customer_name,
         t3.address                                                                                      address,
+        t3.city_name                                                                                    region_name,
         t2.cus_level                                                                                    customer_level,
         t2.tags                                                                                         tags,
         t4.expires                                                                                      loan_expires,
@@ -60,6 +60,10 @@ public class StammkundePoolDTO {
      */
     private String address;
     /**
+     * 区域
+     */
+    private String regionName;
+    /**
      * 客户星级
      */
     private Integer customerLevel;
@@ -64,6 +64,10 @@ public class StammkundePoolVO {
      */
     private String address;
     /**
+     * 区域
+     */
+    private String regionName;
+    /**
      * 客户星级
      */
     private Integer customerLevel;