Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java

@@ -146,7 +146,9 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
         ResultBean rb = ResultBean.fireFail();
         LpkCustomerVo lpkCustomer= baseMapper.getCustomerInfo(sid);
         lpkCustomer.setPhoto(fileUploadComponent.getUrlPrefix() + lpkCustomer.getPhoto());
-        lpkCustomer.setMobile(lpkCustomer.getMobile().replaceAll("(?<=\\d{3})\\d{4}(?=\\d{4})", "****"));
+        if(StringUtils.isNotBlank(lpkCustomer.getMobile())){
+            lpkCustomer.setMobile(lpkCustomer.getMobile().replaceAll("(?<=\\d{3})\\d{4}(?=\\d{4})", "****"));
+        }
         return rb.success().setData(lpkCustomer);
     }