diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachineLabel.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachineLabel.java index 3763716d..2f321a87 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachineLabel.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachineLabel.java @@ -45,9 +45,4 @@ public class MaMachineLabel extends BaseEntity private String companyId; private int labelNum; - - /* *//** 数据所属组织 *//* - @Excel(name = "数据所属组织") - @ApiModelProperty(value = "数据所属组织") - private List<> arryList;*/ } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java index 49054f44..57896ac2 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java @@ -2,7 +2,6 @@ package com.bonus.sgzb.base.api.domain; import lombok.Data; -import java.util.List; /** * @author c liu diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementRelation.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementRelation.java index edb4ae98..c5739057 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementRelation.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementRelation.java @@ -2,8 +2,6 @@ package com.bonus.sgzb.base.api.domain; import lombok.Data; -import java.util.List; - /** * @author c liu * @date 2024/2/21 diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java index db3508a2..43a2f77f 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java @@ -67,7 +67,7 @@ public class SysDept extends BaseEntity /** 子部门 */ @ApiModelProperty(value = "子部门") - private List children = new ArrayList(); + private List children = new ArrayList<>(); /** 备注信息 */ private String remark; diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java index 82107f91..07ae764e 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java @@ -34,7 +34,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfoByPhone(String phone, String source) { - return R.fail("获取用户失败:" + throwable.getMessage()); + return R.fail("根据手机号获取用户失败:" + throwable.getMessage()); } @Override @@ -59,7 +59,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory> getUserList(SysUser sysUser, String source) { - return R.fail("获取用户失败:" + throwable.getMessage()); + return R.fail("获取用户列表失败:" + throwable.getMessage()); } }; }