init: init project step3: rebuild 2

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/base/BaseEntity.java → hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/entity/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.base;
+package com.qunzhixinxi.hnqz.common.core.entity;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/base/HnqzPage.java → hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/entity/HnqzPage.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.base;
+package com.qunzhixinxi.hnqz.common.core.entity;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/enums/InvoiceApprovalStatus.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/InvoiceApprovalStatus.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.enums;
+package com.qunzhixinxi.hnqz.admin.api.constant.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/enums/InvoiceStatus.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/InvoiceStatus.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.enums;
+package com.qunzhixinxi.hnqz.admin.api.constant.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/enums/InvoiceType.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/InvoiceType.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.enums;
+package com.qunzhixinxi.hnqz.admin.api.constant.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/enums/RechargeRecordPackageType.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/RechargeRecordPackageType.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.enums;
+package com.qunzhixinxi.hnqz.admin.api.constant.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/enums/RechargeRecordType.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/RechargeRecordType.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.enums;
+package com.qunzhixinxi.hnqz.admin.api.constant.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/enums/SignatureStatusEnum.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/SignatureStatusEnum.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.enums;
+package com.qunzhixinxi.hnqz.admin.api.constant.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/enums/TargetType.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/TargetType.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.enums;
+package com.qunzhixinxi.hnqz.admin.api.constant.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/CancellationScorePackageDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/CancellationScorePackageDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/CommonEvidenceDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/CommonEvidenceDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.qunzhixinxi.hnqz.admin.api.entity.SysFile;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/CommonUserDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/CommonUserDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/DeptTaskDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/DeptTaskDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/ExecSettlementDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/ExecSettlementDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/NewReportExportDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/NewReportExportDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/NotifyByOneSelfDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/NotifyByOneSelfDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/PickUpScorePackageDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/PickUpScorePackageDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/ReportTaskListPageDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/ReportTaskListPageDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/ScorePackageDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/ScorePackageDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.ChannelEnum;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/ScorePackageSettleNoteDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/ScorePackageSettleNoteDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/SettleConfigDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SettleConfigDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/SettlementDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SettlementDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/SignAgreementDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SignAgreementDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/dto/SysDeptInvoiceRequest.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SysDeptInvoiceRequest.java

@@ -1,8 +1,8 @@
-package com.qunzhixinxi.hnqz.admin.recharge.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceApprovalStatus;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceStatus;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceApprovalStatus;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceStatus;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceType;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/dto/SysDeptRechargeRequest.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/SysDeptRechargeRequest.java

@@ -1,6 +1,6 @@
-package com.qunzhixinxi.hnqz.admin.recharge.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
-import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/UnpackDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/UnpackDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/UserSignCertDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/UserSignCertDTO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/user/UserUpdateInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/UserUpdateInput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.user;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/WmDeptTaskTypeConfigDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/WmDeptTaskTypeConfigDTO.java

@@ -1,6 +1,6 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 
 import javax.validation.Valid;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/dto/WmDeptTaskTypeConfigJsonDTO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/WmDeptTaskTypeConfigJsonDTO.java

@@ -1,6 +1,6 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.dto;
+package com.qunzhixinxi.hnqz.admin.api.dto;
 
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/Contract.java

@@ -2,7 +2,7 @@ package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/MedicalEquipment.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysUser.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.qunzhixinxi.hnqz.admin.api.enums.SignatureStatusEnum;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDaCustomer.java

@@ -3,7 +3,7 @@ package com.qunzhixinxi.hnqz.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TenantStatus;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TenantType;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDeptTaskTypeTemplate.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmProject.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmTeam.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/base/BaseEncryptedInfo.java

@@ -1,58 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.base;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptEncryptor;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * {@code BaseEncryptedInfo} 加密信息基类
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2021-04-06
- * @since ver.1.0.0
- */
-@Data
-public abstract class BaseEncryptedInfo implements Serializable {
-
-	private static final long serialVersionUID = -6417318606163854590L;
-
-	/**
-	 * 时间戳
-	 */
-	private Long timestamp;
-
-	/**
-	 * 编码
-	 */
-	private String charset;
-
-	/**
-	 * 签名类型
-	 */
-	private String signType;
-
-	/**
-	 * 格式
-	 */
-	private String format;
-
-	/**
-	 * 签名摘要
-	 */
-	private String digest;
-
-	/**
-	 * 加密器
-	 */
-	@JsonInclude(value = JsonInclude.Include.NON_NULL)
-	private SysDeptEncryptor deptEncryptor;
-
-	/**
-	 * 请求id
-	 */
-	@JsonInclude(value = JsonInclude.Include.NON_NULL)
-	private Integer inputId;
-}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/entity/SysDeptInvoice.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptInvoice.java

@@ -1,10 +1,10 @@
-package com.qunzhixinxi.hnqz.admin.recharge.entity;
+package com.qunzhixinxi.hnqz.admin.api.feign;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceApprovalStatus;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceApprovalStatus;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceType;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/entity/SysDeptInvoiceRelation.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptInvoiceRelation.java

@@ -1,9 +1,9 @@
-package com.qunzhixinxi.hnqz.admin.recharge.entity;
+package com.qunzhixinxi.hnqz.admin.api.feign;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceStatus;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceStatus;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/entity/SysDeptRecharge.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptRecharge.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.entity;
+package com.qunzhixinxi.hnqz.admin.api.feign;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/entity/SysDeptRechargeRecord.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/feign/SysDeptRechargeRecord.java

@@ -1,10 +1,10 @@
-package com.qunzhixinxi.hnqz.admin.recharge.entity;
+package com.qunzhixinxi.hnqz.admin.api.feign;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordPackageType;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordPackageType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/GigBaseInfoModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/GigBaseInfoModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model;
+package com.qunzhixinxi.hnqz.admin.api.model;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.GigChannelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.GigTypeEnum;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/GigInfoModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/GigInfoModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model;
+package com.qunzhixinxi.hnqz.admin.api.model;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/GigUserInfoModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/GigUserInfoModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model;
+package com.qunzhixinxi.hnqz.admin.api.model;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.MemberIDCardType;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.MemberType;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/BatchDistributionExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/BatchDistributionExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/BatchHospitalExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/BatchHospitalExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/BatchPackageExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/BatchPackageExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/BatchPackageFullTimeExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/BatchPackageFullTimeExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/BatchPackagePartTimeExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/BatchPackagePartTimeExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/BatchPharmacyExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/BatchPharmacyExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/CommonTaskExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/CommonTaskExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/CommonUserExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/CommonUserExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/SettlementProofModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/SettlementProofModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/WmScorePackageExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/WmScorePackageExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/WmSettlePackageSettleExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/WmSettlePackageSettleExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/model/excel/WmTeamExcelModel.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/WmTeamExcelModel.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.model.excel;
+package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/DeptSubLimitAmountInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/DeptSubLimitAmountInput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/NoticeApiInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/NoticeApiInput.java

@@ -15,7 +15,7 @@
  * Author: hnqz
  */
 
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/Record.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/Record.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/SettleAmountMonitorInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/SettleAmountMonitorInput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/SettleNoteStatusOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/SettleNoteStatusOutput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 import lombok.ToString;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/TaskSettleBatch.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/TaskSettleBatch.java

@@ -1,6 +1,5 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
-import com.qunzhixinxi.hnqz.admin.api.entity.input.TaskSettleInfo;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/TaskSettleInfo.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/TaskSettleInfo.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/UserCertificationInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/UserCertificationInput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/WmDept.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmDept.java

@@ -15,7 +15,7 @@
  * Author: hnqz
  */
 
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/WmPackageExportApiInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmPackageExportApiInput.java

@@ -15,7 +15,7 @@
  * Author: hnqz
  */
 
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/WmScorePackageApiInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmScorePackageApiInput.java

@@ -15,7 +15,7 @@
  * Author: hnqz
  */
 
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/WmScorePackageApiOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmScorePackageApiOutput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPkgQuizRelation;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/WmScorePackageSettleInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmScorePackageSettleInput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/WmScorePackageSettleOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmScorePackageSettleOutput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/input/WmWkAlbumApiInput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmWkAlbumApiInput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.input;
+package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/output/BudgetViewOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/output/BudgetViewOutput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.output;
+package com.qunzhixinxi.hnqz.admin.api.model.output;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/output/SettleAmountMonitorOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/output/SettleAmountMonitorOutput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.output;
+package com.qunzhixinxi.hnqz.admin.api.model.output;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/output/UserCertificationOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/output/UserCertificationOutput.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.output;
+package com.qunzhixinxi.hnqz.admin.api.model.output;
 
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/output/WmTaskSettleNoteOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/output/WmTaskSettleNoteOutput.java

@@ -15,7 +15,7 @@
  * Author: hnqz
  */
 
-package com.qunzhixinxi.hnqz.admin.api.entity.output;
+package com.qunzhixinxi.hnqz.admin.api.model.output;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import lombok.Data;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/output/WmTaskTypeDeptOutput.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/output/WmTaskTypeDeptOutput.java

@@ -15,7 +15,7 @@
  * Author: hnqz
  */
 
-package com.qunzhixinxi.hnqz.admin.api.entity.output;
+package com.qunzhixinxi.hnqz.admin.api.model.output;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/vo/SettleFinancialReviewSettleDetailVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SettleFinancialReviewSettleDetailVO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/vo/SettleFinancialReviewVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SettleFinancialReviewVO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import lombok.Data;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/vo/SysDeptInvoiceRelationVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptInvoiceRelationVO.java

@@ -1,7 +1,7 @@
-package com.qunzhixinxi.hnqz.admin.recharge.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceStatus;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceStatus;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/vo/SysDeptInvoiceVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptInvoiceVO.java

@@ -1,7 +1,7 @@
-package com.qunzhixinxi.hnqz.admin.recharge.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceApprovalStatus;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceApprovalStatus;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceType;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/vo/SysDeptRechargeForParkVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptRechargeForParkVO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/vo/SysDeptRechargeRecordForDeptVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptRechargeRecordForDeptVO.java

@@ -1,8 +1,8 @@
-package com.qunzhixinxi.hnqz.admin.recharge.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/vo/SysDeptRechargeRecordVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptRechargeRecordVO.java

@@ -1,8 +1,8 @@
-package com.qunzhixinxi.hnqz.admin.recharge.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import lombok.Data;
 
 import java.io.Serializable;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/vo/SysDeptRechargeVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptRechargeVO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/vo/SysUserSubVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysUserSubVO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.GigCallBackStatus;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.GigChannelEnum;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/vo/WmTaskTypeVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/WmTaskTypeVO.java

@@ -15,7 +15,7 @@
  * Author: hnqz
  */
 
-package com.qunzhixinxi.hnqz.admin.api.entity.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import lombok.Data;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/vo/WmTaskVO.java → hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/WmTaskVO.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.api.entity.vo;
+package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -42,7 +42,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmQuiz;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionRule;
-import com.qunzhixinxi.hnqz.admin.api.user.UserUpdateInput;
+import com.qunzhixinxi.hnqz.admin.api.dto.UserUpdateInput;
 import com.qunzhixinxi.hnqz.admin.api.vo.PersonalScoreRecordVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserBusinessCardVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
@@ -73,12 +73,12 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmUserSignDetail;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmWkAlbum;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmWkArticle;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmWkArticleShare;
-import com.qunzhixinxi.hnqz.admin.api.entity.dto.SignAgreementDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.NoticeApiInput;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.WmScorePackageApiInput;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.WmScorePackageApiOutput;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.WmWkAlbumApiInput;
-import com.qunzhixinxi.hnqz.admin.api.entity.vo.WmTaskTypeVO;
+import com.qunzhixinxi.hnqz.admin.api.dto.SignAgreementDTO;
+import com.qunzhixinxi.hnqz.admin.api.model.input.NoticeApiInput;
+import com.qunzhixinxi.hnqz.admin.api.model.input.WmScorePackageApiInput;
+import com.qunzhixinxi.hnqz.admin.api.model.input.WmScorePackageApiOutput;
+import com.qunzhixinxi.hnqz.admin.api.model.input.WmWkAlbumApiInput;
+import com.qunzhixinxi.hnqz.admin.api.vo.WmTaskTypeVO;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DeptPermissionEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ExcelReportExportController.java

@@ -2,23 +2,12 @@ package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.csp.sentinel.util.StringUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.constant.MqConstants;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
-import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.WmPackageExportApiInput;
-import com.qunzhixinxi.hnqz.admin.service.ReportExportService;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
-import com.qunzhixinxi.hnqz.admin.service.WmReportService;
-import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.common.core.entity.BaseMap;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
@@ -29,19 +18,13 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/MedicalEquipmentController.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.MedicalEquipment;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import com.qunzhixinxi.hnqz.admin.service.MedicalEquipmentService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.common.core.util.R;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ReportExportController.java

@@ -15,8 +15,8 @@ import com.qunzhixinxi.hnqz.admin.api.entity.ReportHandlerDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
-import com.qunzhixinxi.hnqz.admin.api.entity.dto.NewReportExportDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.WmPackageExportApiInput;
+import com.qunzhixinxi.hnqz.admin.api.dto.NewReportExportDTO;
+import com.qunzhixinxi.hnqz.admin.api.model.input.WmPackageExportApiInput;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.ReportTypeEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.ReportHandlerDeptRelationMapper;
 import com.qunzhixinxi.hnqz.admin.service.*;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/controller/SysDeptInvoiceController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptInvoiceController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.controller;
+package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-import com.qunzhixinxi.hnqz.admin.recharge.dto.SysDeptInvoiceRequest;
-import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptInvoice;
-import com.qunzhixinxi.hnqz.admin.recharge.service.SysDeptInvoiceService;
-import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptInvoiceRelationVO;
-import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptInvoiceVO;
+import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptInvoiceRequest;
+import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptInvoiceService;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceRelationVO;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceVO;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/controller/SysDeptRechargeController.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptRechargeController.java

@@ -1,4 +1,4 @@
-package com.qunzhixinxi.hnqz.admin.recharge.controller;
+package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ArrayUtil;
@@ -6,18 +6,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.recharge.dto.SysDeptRechargeRequest;
-import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptInvoice;
-import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptRecharge;
-import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptRechargeRecord;
-import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceApprovalStatus;
-import com.qunzhixinxi.hnqz.admin.recharge.service.SysDeptInvoiceService;
-import com.qunzhixinxi.hnqz.admin.recharge.service.SysDeptRechargeRecordService;
-import com.qunzhixinxi.hnqz.admin.recharge.service.SysDeptRechargeService;
-import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptInvoiceRelationVO;
-import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptRechargeRecordForDeptVO;
-import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptRechargeRecordVO;
-import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptRechargeVO;
+import com.qunzhixinxi.hnqz.admin.api.dto.SysDeptRechargeRequest;
+import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptInvoice;
+import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRecharge;
+import com.qunzhixinxi.hnqz.admin.api.feign.SysDeptRechargeRecord;
+import com.qunzhixinxi.hnqz.admin.api.constant.enums.InvoiceApprovalStatus;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptInvoiceService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptRechargeRecordService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptRechargeService;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptInvoiceRelationVO;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptRechargeRecordForDeptVO;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptRechargeRecordVO;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysDeptRechargeVO;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptSubController.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
-import com.qunzhixinxi.hnqz.admin.api.entity.dto.SettleConfigDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.DeptSubLimitAmountInput;
+import com.qunzhixinxi.hnqz.admin.api.dto.SettleConfigDTO;
+import com.qunzhixinxi.hnqz.admin.api.model.input.DeptSubLimitAmountInput;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectTypeEnum;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysExportController.java

@@ -8,7 +8,7 @@ import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
 import com.qunzhixinxi.hnqz.admin.api.entity.*;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.WmPackageExportApiInput;
+import com.qunzhixinxi.hnqz.admin.api.model.input.WmPackageExportApiInput;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
 import com.qunzhixinxi.hnqz.admin.service.*;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -27,10 +27,10 @@ import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysCsmUserRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserSub;
-import com.qunzhixinxi.hnqz.admin.api.entity.dto.CommonUserDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.input.UserCertificationInput;
-import com.qunzhixinxi.hnqz.admin.api.entity.model.excel.CommonUserExcelModel;
-import com.qunzhixinxi.hnqz.admin.api.entity.vo.SysUserSubVO;
+import com.qunzhixinxi.hnqz.admin.api.dto.CommonUserDTO;
+import com.qunzhixinxi.hnqz.admin.api.model.input.UserCertificationInput;
+import com.qunzhixinxi.hnqz.admin.api.model.excel.CommonUserExcelModel;
+import com.qunzhixinxi.hnqz.admin.api.vo.SysUserSubVO;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.SubjectLocation;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaCustomerController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaCustomer;
-import com.qunzhixinxi.hnqz.admin.api.entity.base.BaseEntity;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TenantStatus;
 import com.qunzhixinxi.hnqz.admin.service.WmDaCustomerService;
 import com.qunzhixinxi.hnqz.common.core.util.R;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaDistributionController.java

@@ -10,7 +10,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDistribution;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;
-import com.qunzhixinxi.hnqz.admin.api.entity.model.excel.BatchDistributionExcelModel;
+import com.qunzhixinxi.hnqz.admin.api.model.excel.BatchDistributionExcelModel;
 import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaHospitalController.java

@@ -26,7 +26,7 @@ import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaHospital;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;
-import com.qunzhixinxi.hnqz.admin.api.entity.model.excel.BatchHospitalExcelModel;
+import com.qunzhixinxi.hnqz.admin.api.model.excel.BatchHospitalExcelModel;
 import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;