Merge branch '0727' of http://114.135.61.188:53000/ZONIOT/water-iot into 0727

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/PayBaseAccountSelectAccountnumberDto.java

@@ -28,7 +28,11 @@ public class PayBaseAccountSelectAccountnumberDto {
     private String	idTypeName	;
     @ApiModelProperty(example = "深圳宝安",notes = "客户地址")
     private String address	;
-    @ApiModelProperty(example = "1",notes = "数表数")
+    @ApiModelProperty(example = "123@qq.com", notes = "邮箱")
+    private String email;
+    @ApiModelProperty(example = "1232", notes = "公司税号")
+    private String vatno;
+    @ApiModelProperty(example = "1",notes = "水表数")
     private int waterNumber;
     @ApiModelProperty(example = "12.2",notes = "用水余额(元)")
     private BigDecimal remaining;

smart-city-platform/src/main/resources/mapper/pay/PayBaseAccountMapper.xml

@@ -344,11 +344,14 @@
             pba.telephone,
             pba.idcardno,
             pba.address,
-            pba.id as "accountId"
+            pba.id as "accountId",
+            pba.email,
+            pbc.vatno
         from pay_base_account pba
         left join pay_sys_dict psd on pba.idtype=psd.`value` and psd.type='证件类型' and psd.site_id=#{siteId} and psd.customer_id=#{customerId}
         left join pay_pay_rechargeaccount ppr on pba.accountnumber=ppr.accountnumber and ppr.site_id=#{siteId} and ppr.customer_id=#{customerId}
         left join pay_sys_dict psd2 on pba.state = psd2.`value` and psd2.type='客户状态' and psd2.site_id=#{siteId} and psd2.customer_id=#{customerId}
+        left join pay_base_customerandmeterrela pbc on pbc.account_id = pba.id
         where pba.accountnumber = #{queryInfo} and pba.site_id=#{siteId} and pba.customer_id=#{customerId}
 
     </select>