Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java

@@ -241,9 +241,23 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
                 if (StringUtils.isNotBlank(customerTempVo.getEndDate())) {
                     vo.setDocumentsDate(customerTempVo.getEndDate());
                 }
+                String province = "";
+                String city = "";
+                String county = "";
+                String address = "";
+                if (StringUtils.isNotBlank(customerTempVo.getProvince())) {
+                    province = customerTempVo.getProvince();
+                }
+                if (StringUtils.isNotBlank(customerTempVo.getCity())) {
+                    city = customerTempVo.getCity();
+                }
+                if (StringUtils.isNotBlank(customerTempVo.getCounty())) {
+                    county = customerTempVo.getCounty();
+                }
                 if (StringUtils.isNotBlank(customerTempVo.getAddress())) {
-                    vo.setClientAddress(customerTempVo.getAddress());
+                    address = customerTempVo.getAddress();
                 }
+                vo.setClientAddress(province + city + county + address);
             }
         }
         //查询企业人员信息