Browse Source

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

wangyu 6 years ago
parent
commit
fad63cfe97
1 changed files with 3 additions and 3 deletions
  1. 3 3
      user-service/src/main/java/com/diagbot/facade/UserFacade.java

+ 3 - 3
user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -973,7 +973,7 @@ public class UserFacade extends UserServiceImpl {
         int renewalSum = renewalSums.data;
         //System.out.println("========renewalSu====="+renewalSum);
         if(renewalSum>0){
-   		 return RespDTO.onError("该用户存在续费申请单,请先审核");
+   		 return RespDTO.onError("该用户无法删除,请先处理产品申请信息");
       	}
         //查询用户是否有待审核的产品数量
         RespDTO<Integer> auditSums = diagbotmanClient.getOrderByUserToAudit(baseIdVO.getId());
@@ -1304,7 +1304,7 @@ public class UserFacade extends UserServiceImpl {
         listName.add("编号");
         listName.add("注册时间");
         listName.add("认证单号");
-        listName.add("超管名称");
+        listName.add("超管名称");
         listName.add("所在机构");
         listName.add("岗位名称");
         listName.add("手机号");
@@ -1356,7 +1356,7 @@ public class UserFacade extends UserServiceImpl {
         listName.add("编号");
         listName.add("注册时间");
         listName.add("审核通过时间");
-        listName.add("超管名称");
+        listName.add("超管名称");
         listName.add("所在机构");
         listName.add("岗位名称");
         listName.add("手机号");