'调整模块划分'

hzgzpt-admin/pom.xml

@@ -60,7 +60,7 @@
         <!-- app端-->
         <dependency>
             <groupId>com.miaxis</groupId>
-            <artifactId>hzgzpt-service-app</artifactId>
+            <artifactId>hzgzpt-service</artifactId>
             <version>3.2.1</version>
         </dependency>
         <!-- 定时任务-->

hzgzpt-admin/src/main/java/com/miaxis/app/controller/coach/CoachEvaluateController.java

@@ -1,13 +1,11 @@
 package com.miaxis.app.controller.coach;
 
-import com.miaxis.app.coach.domain.CoachEvaluateLabel;
-import com.miaxis.app.coach.dto.CoachEvaluateDto;
-import com.miaxis.app.coach.service.ICoachEvaluateService;
-import com.miaxis.common.annotation.Log;
+import com.miaxis.coach.domain.CoachEvaluateLabel;
+import com.miaxis.coach.dto.CoachEvaluateDto;
+import com.miaxis.coach.service.ICoachEvaluateService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.enums.BusinessTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/coach/CoachInfoController.java

@@ -1,16 +1,15 @@
 package com.miaxis.app.controller.coach;
 
-import com.miaxis.app.coach.domain.CoachInfo;
-import com.miaxis.app.coach.dto.CoachInfoDTO;
-import com.miaxis.app.coach.dto.CoachInfoVO;
-import com.miaxis.app.coach.service.ICoachInfoService;
+import com.miaxis.coach.domain.CoachInfo;
+import com.miaxis.coach.dto.CoachInfoDTO;
+import com.miaxis.coach.dto.CoachInfoVO;
+import com.miaxis.coach.service.ICoachInfoService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/hospital/HospitalInfoController.java

@@ -1,8 +1,8 @@
 package com.miaxis.app.controller.hospital;
 
 
-import com.miaxis.app.hospital.domain.HospitalInfo;
-import com.miaxis.app.hospital.service.IHospitalInfoService;
+import com.miaxis.hospital.domain.HospitalInfo;
+import com.miaxis.hospital.service.IHospitalInfoService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/news/NewsInfoController.java

@@ -1,14 +1,11 @@
 package com.miaxis.app.controller.news;
 
-import com.miaxis.app.news.domain.NewsInfo;
-import com.miaxis.app.news.service.INewsInfoService;
-import com.miaxis.common.annotation.Log;
+import com.miaxis.news.domain.NewsInfo;
+import com.miaxis.news.service.INewsInfoService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/report/ReportInfoController.java

@@ -1,10 +1,10 @@
 package com.miaxis.app.controller.report;
 
-import com.miaxis.app.file.vo.FileVo;
-import com.miaxis.app.report.domain.ReportInfo;
-import com.miaxis.app.report.dto.ReportInfoDTO;
-import com.miaxis.app.report.service.IReportImagesService;
-import com.miaxis.app.report.service.IReportInfoService;
+import com.miaxis.file.vo.FileVo;
+import com.miaxis.report.domain.ReportInfo;
+import com.miaxis.report.dto.ReportInfoDTO;
+import com.miaxis.report.service.IReportImagesService;
+import com.miaxis.report.service.IReportInfoService;
 import com.miaxis.common.aliyunOSS.AliyunConfig;
 import com.miaxis.common.aliyunOSS.AliyunUpload;
 import com.miaxis.common.annotation.Log;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolEvaluateController.java

@@ -1,9 +1,9 @@
 package com.miaxis.app.controller.school;
 
 
-import com.miaxis.app.school.domain.SchoolEvaluateLabel;
-import com.miaxis.app.school.dto.SchoolEvaluateDto;
-import com.miaxis.app.school.service.ISchoolEvaluateService;
+import com.miaxis.school.domain.SchoolEvaluateLabel;
+import com.miaxis.school.dto.SchoolEvaluateDto;
+import com.miaxis.school.service.ISchoolEvaluateService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolInfoController.java

@@ -1,11 +1,11 @@
 package com.miaxis.app.controller.school;
 
-import com.miaxis.app.school.domain.SchoolInfo;
-import com.miaxis.app.school.dto.SchoolInfoDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalVO;
-import com.miaxis.app.school.dto.SchoolInfoVO;
-import com.miaxis.app.school.service.ISchoolInfoService;
+import com.miaxis.school.domain.SchoolInfo;
+import com.miaxis.school.dto.SchoolInfoDTO;
+import com.miaxis.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.school.dto.SchoolInfoEvalVO;
+import com.miaxis.school.dto.SchoolInfoVO;
+import com.miaxis.school.service.ISchoolInfoService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolRegionController.java

@@ -1,7 +1,7 @@
 package com.miaxis.app.controller.school;
 
-import com.miaxis.app.school.domain.SchoolRegion;
-import com.miaxis.app.school.service.ISchoolRegionService;
+import com.miaxis.school.domain.SchoolRegion;
+import com.miaxis.school.service.ISchoolRegionService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;

hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -1,9 +1,9 @@
 package com.miaxis.app.controller.user;
 
-import com.miaxis.app.file.vo.FileVo;
-import com.miaxis.app.user.dto.UserDto;
-import com.miaxis.app.user.service.IUserInfoService;
-import com.miaxis.app.user.vo.UserVo;
+import com.miaxis.file.vo.FileVo;
+import com.miaxis.user.dto.UserDto;
+import com.miaxis.user.service.IUserInfoService;
+import com.miaxis.user.vo.UserVo;
 import com.miaxis.common.aliyunOSS.AliyunConfig;
 import com.miaxis.common.aliyunOSS.AliyunUpload;
 import com.miaxis.common.constant.Constants;

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/coach/PcCoachEvaluateController.java

@@ -1,7 +1,7 @@
 package com.miaxis.pc.controller.coach;
 
-import com.miaxis.app.coach.domain.CoachEvaluate;
-import com.miaxis.app.coach.service.ICoachEvaluateService;
+import com.miaxis.coach.domain.CoachEvaluate;
+import com.miaxis.coach.service.ICoachEvaluateService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/coach/PcCoachInfoController.java

@@ -4,8 +4,8 @@ import java.util.List;
 import java.util.Arrays;
 
 
-import com.miaxis.app.coach.domain.CoachInfo;
-import com.miaxis.app.coach.service.ICoachInfoService;
+import com.miaxis.coach.domain.CoachInfo;
+import com.miaxis.coach.service.ICoachInfoService;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolClassTypeController.java

@@ -1,7 +1,7 @@
 package com.miaxis.pc.controller.school;
 
-import com.miaxis.app.school.domain.SchoolClassType;
-import com.miaxis.app.school.service.ISchoolClassTypeService;
+import com.miaxis.school.domain.SchoolClassType;
+import com.miaxis.school.service.ISchoolClassTypeService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolEvaluateController.java

@@ -1,13 +1,12 @@
 package com.miaxis.pc.controller.school;
 
-import com.miaxis.app.school.domain.SchoolEvaluate;
-import com.miaxis.app.school.service.ISchoolEvaluateService;
-import com.miaxis.common.constant.Constants;
+import com.miaxis.school.domain.SchoolEvaluate;
+import com.miaxis.school.service.ISchoolEvaluateService;
+
 import java.util.List;
 import java.util.Arrays;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

hzgzpt-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -1,7 +1,7 @@
 package com.miaxis.system.controller.system;
 
-import com.miaxis.app.sms.ISmsService;
-import com.miaxis.app.sms.domain.SmsParameter;
+import com.miaxis.sms.ISmsService;
+import com.miaxis.sms.domain.SmsParameter;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysMenu;
 import com.miaxis.common.core.domain.entity.SysUser;

hzgzpt-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -1,7 +1,7 @@
 package com.miaxis.test;
 
 import com.miaxis.HzgzptApplication;
-import com.miaxis.app.test.Impl.TestServiceImpl;
+import com.miaxis.test.Impl.TestServiceImpl;
 import com.miaxis.common.sign.PlatUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;

hzgzpt-admin/src/test/java/com/miaxis/test/feign/FeignTest.java

@@ -1,8 +1,8 @@
 package com.miaxis.test.feign;
 
 import com.miaxis.HzgzptApplication;
-import com.miaxis.app.feign.IQgptService;
-import com.miaxis.app.test.Impl.TestServiceImpl;
+import com.miaxis.feign.IQgptService;
+import com.miaxis.test.Impl.TestServiceImpl;
 import com.miaxis.common.sign.ISign;
 import com.miaxis.common.sign.PlatUtil;
 import com.miaxis.common.sign.Sign;

hzgzpt-service-app/pom.xml → hzgzpt-service/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hzgzpt-service-app</artifactId>
+    <artifactId>hzgzpt-service</artifactId>
     <dependencies>
 
         <!-- 通用工具-->
@@ -37,4 +37,4 @@
     </dependencies>
 
 
-</project>
+</project>

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/CoachEvaluate.java → hzgzpt-service/src/main/java/com/miaxis/coach/domain/CoachEvaluate.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.coach.domain;
+package com.miaxis.coach.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/CoachEvaluateImages.java → hzgzpt-service/src/main/java/com/miaxis/coach/domain/CoachEvaluateImages.java

@@ -1,15 +1,11 @@
-package com.miaxis.app.coach.domain;
+package com.miaxis.coach.domain;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/CoachEvaluateLabel.java → hzgzpt-service/src/main/java/com/miaxis/coach/domain/CoachEvaluateLabel.java

@@ -1,15 +1,11 @@
-package com.miaxis.app.coach.domain;
+package com.miaxis.coach.domain;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/CoachInfo.java → hzgzpt-service/src/main/java/com/miaxis/coach/domain/CoachInfo.java

@@ -1,15 +1,13 @@
-package com.miaxis.app.coach.domain;
+package com.miaxis.coach.domain;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/dto/CoachEvaluateDto.java → hzgzpt-service/src/main/java/com/miaxis/coach/dto/CoachEvaluateDto.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.coach.dto;
+package com.miaxis.coach.dto;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModelProperty;

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/dto/CoachInfoDTO.java → hzgzpt-service/src/main/java/com/miaxis/coach/dto/CoachInfoDTO.java

@@ -1,6 +1,5 @@
-package com.miaxis.app.coach.dto;
+package com.miaxis.coach.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/dto/CoachInfoVO.java → hzgzpt-service/src/main/java/com/miaxis/coach/dto/CoachInfoVO.java

@@ -1,15 +1,9 @@
-package com.miaxis.app.coach.dto;
+package com.miaxis.coach.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 教练对象 coach_info

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/mapper/CoachEvaluateImagesMapper.java → hzgzpt-service/src/main/java/com/miaxis/coach/mapper/CoachEvaluateImagesMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.coach.mapper;
+package com.miaxis.coach.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.coach.domain.CoachEvaluateImages;
+import com.miaxis.coach.domain.CoachEvaluateImages;
 
 /**
  * 教练评价照片Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/mapper/CoachEvaluateLabelMapper.java → hzgzpt-service/src/main/java/com/miaxis/coach/mapper/CoachEvaluateLabelMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.coach.mapper;
+package com.miaxis.coach.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.coach.domain.CoachEvaluateLabel;
+import com.miaxis.coach.domain.CoachEvaluateLabel;
 
 
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/mapper/CoachEvaluateMapper.java → hzgzpt-service/src/main/java/com/miaxis/coach/mapper/CoachEvaluateMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.coach.mapper;
+package com.miaxis.coach.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.coach.domain.CoachEvaluate;
+import com.miaxis.coach.domain.CoachEvaluate;
 
 /**
  * 教练评价Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/mapper/CoachInfoMapper.java → hzgzpt-service/src/main/java/com/miaxis/coach/mapper/CoachInfoMapper.java

@@ -1,10 +1,11 @@
-package com.miaxis.app.coach.mapper;
+package com.miaxis.coach.mapper;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.coach.domain.CoachInfo;
-import com.miaxis.app.coach.dto.CoachInfoDTO;
-import com.miaxis.app.coach.dto.CoachInfoVO;
+import com.miaxis.coach.domain.CoachInfo;
+import com.miaxis.coach.dto.CoachInfoDTO;
+import com.miaxis.coach.dto.CoachInfoVO;
+
+import java.util.List;
 
 /**
  * 教练Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachEvaluateImagesService.java → hzgzpt-service/src/main/java/com/miaxis/coach/service/ICoachEvaluateImagesService.java

@@ -1,12 +1,12 @@
-package com.miaxis.app.coach.service;
+package com.miaxis.coach.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.coach.domain.CoachEvaluateImages;
+import com.miaxis.coach.domain.CoachEvaluateImages;
 
 /**
  * 教练评价照片Service接口
- * 
+ *
  * @author miaxis
  * @date 2020-12-28
  */

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachEvaluateService.java → hzgzpt-service/src/main/java/com/miaxis/coach/service/ICoachEvaluateService.java

@@ -1,17 +1,17 @@
-package com.miaxis.app.coach.service;
+package com.miaxis.coach.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.coach.domain.CoachEvaluate;
-import com.miaxis.app.coach.domain.CoachEvaluateLabel;
-import com.miaxis.app.coach.dto.CoachEvaluateDto;
+import com.miaxis.coach.domain.CoachEvaluate;
+import com.miaxis.coach.domain.CoachEvaluateLabel;
+import com.miaxis.coach.dto.CoachEvaluateDto;
 import com.miaxis.common.core.domain.Response;
 
 import java.util.List;
 
 /**
  * 教练评价Service接口
- * 
+ *
  * @author wwl
  * @date 2020-12-28
  */

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachInfoService.java → hzgzpt-service/src/main/java/com/miaxis/coach/service/ICoachInfoService.java

@@ -1,21 +1,21 @@
-package com.miaxis.app.coach.service;
+package com.miaxis.coach.service;
 
 import java.util.List;
-import com.miaxis.app.coach.domain.CoachInfo;
+import com.miaxis.coach.domain.CoachInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.coach.dto.CoachInfoDTO;
-import com.miaxis.app.coach.dto.CoachInfoVO;
+import com.miaxis.coach.dto.CoachInfoDTO;
+import com.miaxis.coach.dto.CoachInfoVO;
 
 /**
  * 教练Service接口
- * 
+ *
  * @author wwl
  * @date 2021-01-07
  */
 public interface ICoachInfoService extends IService<CoachInfo>{
     /**
      * 查询教练
-     * 
+     *
      * @param coachnum 教练ID
      * @return 教练
      */
@@ -23,7 +23,7 @@ public interface ICoachInfoService extends IService<CoachInfo>{
 
     /**
      * 查询教练列表
-     * 
+     *
      * @param coachInfo 教练
      * @return 教练集合
      */
@@ -31,7 +31,7 @@ public interface ICoachInfoService extends IService<CoachInfo>{
 
     /**
      * 新增教练
-     * 
+     *
      * @param coachInfo 教练
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface ICoachInfoService extends IService<CoachInfo>{
 
     /**
      * 修改教练
-     * 
+     *
      * @param coachInfo 教练
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface ICoachInfoService extends IService<CoachInfo>{
 
     /**
      * 批量删除教练
-     * 
+     *
      * @param coachnums 需要删除的教练ID
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface ICoachInfoService extends IService<CoachInfo>{
 
     /**
      * 删除教练信息
-     * 
+     *
      * @param coachnum 教练ID
      * @return 结果
      */

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachEvaluateImagesServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/coach/service/impl/CoachEvaluateImagesServiceImpl.java

@@ -1,10 +1,10 @@
-package com.miaxis.app.coach.service.impl;
+package com.miaxis.coach.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.coach.domain.CoachEvaluateImages;
-import com.miaxis.app.coach.mapper.CoachEvaluateImagesMapper;
-import com.miaxis.app.coach.service.ICoachEvaluateImagesService;
+import com.miaxis.coach.domain.CoachEvaluateImages;
+import com.miaxis.coach.mapper.CoachEvaluateImagesMapper;
+import com.miaxis.coach.service.ICoachEvaluateImagesService;
 import org.springframework.stereotype.Service;
 
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachEvaluateServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/coach/service/impl/CoachEvaluateServiceImpl.java

@@ -1,18 +1,18 @@
-package com.miaxis.app.coach.service.impl;
+package com.miaxis.coach.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.coach.domain.CoachEvaluate;
-import com.miaxis.app.coach.domain.CoachEvaluateImages;
-import com.miaxis.app.coach.domain.CoachEvaluateLabel;
-import com.miaxis.app.coach.dto.CoachEvaluateDto;
-import com.miaxis.app.coach.mapper.CoachEvaluateLabelMapper;
-import com.miaxis.app.coach.mapper.CoachEvaluateMapper;
-import com.miaxis.app.coach.service.ICoachEvaluateImagesService;
-import com.miaxis.app.coach.service.ICoachEvaluateService;
+import com.miaxis.coach.domain.CoachEvaluate;
+import com.miaxis.coach.domain.CoachEvaluateImages;
+import com.miaxis.coach.domain.CoachEvaluateLabel;
+import com.miaxis.coach.dto.CoachEvaluateDto;
+import com.miaxis.coach.mapper.CoachEvaluateLabelMapper;
+import com.miaxis.coach.mapper.CoachEvaluateMapper;
+import com.miaxis.coach.service.ICoachEvaluateImagesService;
+import com.miaxis.coach.service.ICoachEvaluateService;
 import com.miaxis.common.core.domain.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachInfoServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/coach/service/impl/CoachInfoServiceImpl.java

@@ -1,19 +1,19 @@
-package com.miaxis.app.coach.service.impl;
+package com.miaxis.coach.service.impl;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.coach.dto.CoachInfoDTO;
-import com.miaxis.app.coach.dto.CoachInfoVO;
+import com.miaxis.coach.dto.CoachInfoDTO;
+import com.miaxis.coach.dto.CoachInfoVO;
 import com.miaxis.common.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.app.coach.mapper.CoachInfoMapper;
-import com.miaxis.app.coach.domain.CoachInfo;
-import com.miaxis.app.coach.service.ICoachInfoService;
+import com.miaxis.coach.mapper.CoachInfoMapper;
+import com.miaxis.coach.domain.CoachInfo;
+import com.miaxis.coach.service.ICoachInfoService;
 
 /**
  * 教练Service业务层处理

hzgzpt-service-app/src/main/java/com/miaxis/app/feign/IQgptService.java → hzgzpt-service/src/main/java/com/miaxis/feign/IQgptService.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.feign;
+package com.miaxis.feign;
 
 
 import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;

hzgzpt-service-app/src/main/java/com/miaxis/app/feign/ITMTrainRecordDataService.java → hzgzpt-service/src/main/java/com/miaxis/feign/ITMTrainRecordDataService.java

@@ -1,7 +1,7 @@
-package com.miaxis.app.feign;
+package com.miaxis.feign;
 
 
-import com.miaxis.app.school.domain.SchoolInfo;
+import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;

hzgzpt-service-app/src/main/java/com/miaxis/app/file/vo/FileVo.java → hzgzpt-service/src/main/java/com/miaxis/file/vo/FileVo.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.file.vo;
+package com.miaxis.file.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

hzgzpt-service-app/src/main/java/com/miaxis/app/hospital/domain/HospitalInfo.java → hzgzpt-service/src/main/java/com/miaxis/hospital/domain/HospitalInfo.java

@@ -1,14 +1,12 @@
-package com.miaxis.app.hospital.domain;
+package com.miaxis.hospital.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;

hzgzpt-service-app/src/main/java/com/miaxis/app/hospital/mapper/HospitalInfoMapper.java → hzgzpt-service/src/main/java/com/miaxis/hospital/mapper/HospitalInfoMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.hospital.mapper;
+package com.miaxis.hospital.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.hospital.domain.HospitalInfo;
+import com.miaxis.hospital.domain.HospitalInfo;
 
 /**
  * 体检医院Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/hospital/service/IHospitalInfoService.java → hzgzpt-service/src/main/java/com/miaxis/hospital/service/IHospitalInfoService.java

@@ -1,19 +1,19 @@
-package com.miaxis.app.hospital.service;
+package com.miaxis.hospital.service;
 
 import java.util.List;
-import com.miaxis.app.hospital.domain.HospitalInfo;
+import com.miaxis.hospital.domain.HospitalInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * 体检医院Service接口
- * 
+ *
  * @author miaxis
  * @date 2021-01-11
  */
 public interface IHospitalInfoService extends IService<HospitalInfo>{
     /**
      * 查询体检医院
-     * 
+     *
      * @param id 体检医院ID
      * @return 体检医院
      */
@@ -21,7 +21,7 @@ public interface IHospitalInfoService extends IService<HospitalInfo>{
 
     /**
      * 查询体检医院列表
-     * 
+     *
      * @param hospitalInfo 体检医院
      * @return 体检医院集合
      */
@@ -29,7 +29,7 @@ public interface IHospitalInfoService extends IService<HospitalInfo>{
 
     /**
      * 新增体检医院
-     * 
+     *
      * @param hospitalInfo 体检医院
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IHospitalInfoService extends IService<HospitalInfo>{
 
     /**
      * 修改体检医院
-     * 
+     *
      * @param hospitalInfo 体检医院
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IHospitalInfoService extends IService<HospitalInfo>{
 
     /**
      * 批量删除体检医院
-     * 
+     *
      * @param ids 需要删除的体检医院ID
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IHospitalInfoService extends IService<HospitalInfo>{
 
     /**
      * 删除体检医院信息
-     * 
+     *
      * @param id 体检医院ID
      * @return 结果
      */

hzgzpt-service-app/src/main/java/com/miaxis/app/hospital/service/impl/HospitalInfoServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/hospital/service/impl/HospitalInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package com.miaxis.app.hospital.service.impl;
+package com.miaxis.hospital.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.app.hospital.mapper.HospitalInfoMapper;
-import com.miaxis.app.hospital.domain.HospitalInfo;
-import com.miaxis.app.hospital.service.IHospitalInfoService;
+import com.miaxis.hospital.mapper.HospitalInfoMapper;
+import com.miaxis.hospital.domain.HospitalInfo;
+import com.miaxis.hospital.service.IHospitalInfoService;
 
 /**
  * 体检医院Service业务层处理

hzgzpt-service-app/src/main/java/com/miaxis/app/news/domain/NewsInfo.java → hzgzpt-service/src/main/java/com/miaxis/news/domain/NewsInfo.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.news.domain;
+package com.miaxis.news.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/news/mapper/NewsInfoMapper.java → hzgzpt-service/src/main/java/com/miaxis/news/mapper/NewsInfoMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.news.mapper;
+package com.miaxis.news.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.news.domain.NewsInfo;
+import com.miaxis.news.domain.NewsInfo;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/news/service/INewsInfoService.java → hzgzpt-service/src/main/java/com/miaxis/news/service/INewsInfoService.java

@@ -1,21 +1,21 @@
-package com.miaxis.app.news.service;
+package com.miaxis.news.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.news.domain.NewsInfo;
+import com.miaxis.news.domain.NewsInfo;
 
 import java.util.List;
 
 /**
  * 新闻(首页资讯、通知、公告相关)Service接口
- * 
+ *
  * @author miaxis
  * @date 2020-12-22
  */
 public interface INewsInfoService extends IService<NewsInfo> {
     /**
      * 查询新闻(首页资讯、通知、公告相关)
-     * 
+     *
      * @param id 新闻(首页资讯、通知、公告相关)ID
      * @return 新闻(首页资讯、通知、公告相关)
      */
@@ -23,7 +23,7 @@ public interface INewsInfoService extends IService<NewsInfo> {
 
     /**
      * 查询新闻(首页资讯、通知、公告相关)列表
-     * 
+     *
      * @param newsInfo 新闻(首页资讯、通知、公告相关)
      * @return 新闻(首页资讯、通知、公告相关)集合
      */
@@ -31,7 +31,7 @@ public interface INewsInfoService extends IService<NewsInfo> {
 
     /**
      * 新增新闻(首页资讯、通知、公告相关)
-     * 
+     *
      * @param newsInfo 新闻(首页资讯、通知、公告相关)
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface INewsInfoService extends IService<NewsInfo> {
 
     /**
      * 修改新闻(首页资讯、通知、公告相关)
-     * 
+     *
      * @param newsInfo 新闻(首页资讯、通知、公告相关)
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface INewsInfoService extends IService<NewsInfo> {
 
     /**
      * 批量删除新闻(首页资讯、通知、公告相关)
-     * 
+     *
      * @param ids 需要删除的新闻(首页资讯、通知、公告相关)ID
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface INewsInfoService extends IService<NewsInfo> {
 
     /**
      * 删除新闻(首页资讯、通知、公告相关)信息
-     * 
+     *
      * @param id 新闻(首页资讯、通知、公告相关)ID
      * @return 结果
      */

hzgzpt-service-app/src/main/java/com/miaxis/app/news/service/impl/NewsInfoServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/news/service/impl/NewsInfoServiceImpl.java

@@ -1,10 +1,10 @@
-package com.miaxis.app.news.service.impl;
+package com.miaxis.news.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.news.domain.NewsInfo;
-import com.miaxis.app.news.mapper.NewsInfoMapper;
-import com.miaxis.app.news.service.INewsInfoService;
+import com.miaxis.news.domain.NewsInfo;
+import com.miaxis.news.mapper.NewsInfoMapper;
+import com.miaxis.news.service.INewsInfoService;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.stereotype.Service;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/report/domain/ReportImages.java → hzgzpt-service/src/main/java/com/miaxis/report/domain/ReportImages.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.report.domain;
+package com.miaxis.report.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/report/domain/ReportInfo.java → hzgzpt-service/src/main/java/com/miaxis/report/domain/ReportInfo.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.report.domain;
+package com.miaxis.report.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/report/dto/ReportInfoDTO.java → hzgzpt-service/src/main/java/com/miaxis/report/dto/ReportInfoDTO.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.report.dto;
+package com.miaxis.report.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.app.file.vo.FileVo;
+import com.miaxis.file.vo.FileVo;
 import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;

hzgzpt-service-app/src/main/java/com/miaxis/app/report/mapper/ReportImagesMapper.java → hzgzpt-service/src/main/java/com/miaxis/report/mapper/ReportImagesMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.report.mapper;
+package com.miaxis.report.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.report.domain.ReportImages;
+import com.miaxis.report.domain.ReportImages;
 
 /**
  * 用户照片Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/report/mapper/ReportInfoMapper.java → hzgzpt-service/src/main/java/com/miaxis/report/mapper/ReportInfoMapper.java

@@ -1,7 +1,7 @@
-package com.miaxis.app.report.mapper;
+package com.miaxis.report.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.report.domain.ReportInfo;
+import com.miaxis.report.domain.ReportInfo;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/report/service/IReportImagesService.java → hzgzpt-service/src/main/java/com/miaxis/report/service/IReportImagesService.java

@@ -1,7 +1,7 @@
-package com.miaxis.app.report.service;
+package com.miaxis.report.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.report.domain.ReportImages;
+import com.miaxis.report.domain.ReportImages;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/report/service/IReportInfoService.java → hzgzpt-service/src/main/java/com/miaxis/report/service/IReportInfoService.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.report.service;
+package com.miaxis.report.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.report.domain.ReportInfo;
-import com.miaxis.app.report.dto.ReportInfoDTO;
+import com.miaxis.report.domain.ReportInfo;
+import com.miaxis.report.dto.ReportInfoDTO;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/report/service/impl/ReportImagesServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/report/service/impl/ReportImagesServiceImpl.java

@@ -1,13 +1,13 @@
-package com.miaxis.app.report.service.impl;
+package com.miaxis.report.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.app.report.mapper.ReportImagesMapper;
-import com.miaxis.app.report.domain.ReportImages;
-import com.miaxis.app.report.service.IReportImagesService;
+import com.miaxis.report.mapper.ReportImagesMapper;
+import com.miaxis.report.domain.ReportImages;
+import com.miaxis.report.service.IReportImagesService;
 
 /**
  * 用户照片Service业务层处理

hzgzpt-service-app/src/main/java/com/miaxis/app/report/service/impl/ReportInfoServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/report/service/impl/ReportInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package com.miaxis.app.report.service.impl;
+package com.miaxis.report.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.file.vo.FileVo;
-import com.miaxis.app.report.domain.ReportImages;
-import com.miaxis.app.report.domain.ReportInfo;
-import com.miaxis.app.report.dto.ReportInfoDTO;
-import com.miaxis.app.report.mapper.ReportInfoMapper;
-import com.miaxis.app.report.service.IReportImagesService;
-import com.miaxis.app.report.service.IReportInfoService;
+import com.miaxis.file.vo.FileVo;
+import com.miaxis.report.domain.ReportImages;
+import com.miaxis.report.domain.ReportInfo;
+import com.miaxis.report.dto.ReportInfoDTO;
+import com.miaxis.report.mapper.ReportInfoMapper;
+import com.miaxis.report.service.IReportImagesService;
+import com.miaxis.report.service.IReportInfoService;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.DateUtils;
 import com.miaxis.common.utils.StringUtils;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolClassType.java → hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolClassType.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.domain;
+package com.miaxis.school.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,8 +9,6 @@ import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolEvaluate.java → hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolEvaluate.java

@@ -1,15 +1,11 @@
-package com.miaxis.app.school.domain;
+package com.miaxis.school.domain;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolEvaluateImages.java → hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolEvaluateImages.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.domain;
+package com.miaxis.school.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolEvaluateLabel.java → hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolEvaluateLabel.java

@@ -1,15 +1,11 @@
-package com.miaxis.app.school.domain;
+package com.miaxis.school.domain;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolInfo.java → hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolInfo.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.domain;
+package com.miaxis.school.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -8,12 +8,10 @@ import com.miaxis.common.core.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolRegion.java → hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolRegion.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.domain;
+package com.miaxis.school.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolEvaluateDto.java → hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolEvaluateDto.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.dto;
+package com.miaxis.school.dto;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoDTO.java → hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.dto;
+package com.miaxis.school.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoEvalDTO.java → hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoEvalDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.dto;
+package com.miaxis.school.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoEvalVO.java → hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoEvalVO.java

@@ -1,14 +1,10 @@
-package com.miaxis.app.school.dto;
+package com.miaxis.school.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 驾校对象返回对象 SchoolInfoEvalVO
  * 驾校信息排名列表

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolInfoVO.java → hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoVO.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.dto;
+package com.miaxis.school.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.miaxis.common.core.domain.BaseBusinessEntity;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolRegionDTO.java → hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolRegionDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.dto;
+package com.miaxis.school.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/dto/SchoolRegionVO.java → hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolRegionVO.java

@@ -1,10 +1,6 @@
-package com.miaxis.app.school.dto;
+package com.miaxis.school.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolClassTypeMapper.java → hzgzpt-service/src/main/java/com/miaxis/school/mapper/SchoolClassTypeMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.school.mapper;
+package com.miaxis.school.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.school.domain.SchoolClassType;
+import com.miaxis.school.domain.SchoolClassType;
 
 /**
  * 驾校班型Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolEvaluateImagesMapper.java → hzgzpt-service/src/main/java/com/miaxis/school/mapper/SchoolEvaluateImagesMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.school.mapper;
+package com.miaxis.school.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.school.domain.SchoolEvaluateImages;
+import com.miaxis.school.domain.SchoolEvaluateImages;
 
 /**
  * 驾校评价照片Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolEvaluateLabelMapper.java → hzgzpt-service/src/main/java/com/miaxis/school/mapper/SchoolEvaluateLabelMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.school.mapper;
+package com.miaxis.school.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.school.domain.SchoolEvaluateLabel;
+import com.miaxis.school.domain.SchoolEvaluateLabel;
 
 /**
  * 驾校评价标签Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolEvaluateMapper.java → hzgzpt-service/src/main/java/com/miaxis/school/mapper/SchoolEvaluateMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.school.mapper;
+package com.miaxis.school.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.school.domain.SchoolEvaluate;
+import com.miaxis.school.domain.SchoolEvaluate;
 
 /**
  * 驾校评价Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolInfoMapper.java → hzgzpt-service/src/main/java/com/miaxis/school/mapper/SchoolInfoMapper.java

@@ -1,14 +1,13 @@
-package com.miaxis.app.school.mapper;
+package com.miaxis.school.mapper;
 
 import java.util.List;
-import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.school.domain.SchoolInfo;
-import com.miaxis.app.school.dto.SchoolInfoDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalVO;
-import com.miaxis.app.school.dto.SchoolInfoVO;
+import com.miaxis.school.domain.SchoolInfo;
+import com.miaxis.school.dto.SchoolInfoDTO;
+import com.miaxis.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.school.dto.SchoolInfoEvalVO;
+import com.miaxis.school.dto.SchoolInfoVO;
 
 /**
  * 驾校Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolRegionMapper.java → hzgzpt-service/src/main/java/com/miaxis/school/mapper/SchoolRegionMapper.java

@@ -1,7 +1,7 @@
-package com.miaxis.app.school.mapper;
+package com.miaxis.school.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.school.domain.SchoolRegion;
 
 /**
  * 驾校训练场Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolClassTypeService.java → hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolClassTypeService.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.school.service;
+package com.miaxis.school.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.school.domain.SchoolClassType;
+import com.miaxis.school.domain.SchoolClassType;
 
 import java.util.List;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolEvaluateImagesService.java → hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolEvaluateImagesService.java

@@ -1,12 +1,12 @@
-package com.miaxis.app.school.service;
+package com.miaxis.school.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.school.domain.SchoolEvaluateImages;
+import com.miaxis.school.domain.SchoolEvaluateImages;
 
 /**
  * 驾校评价照片Service接口
- * 
+ *
  * @author miaxis
  * @date 2020-12-29
  */

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolEvaluateService.java → hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolEvaluateService.java

@@ -1,17 +1,17 @@
-package com.miaxis.app.school.service;
+package com.miaxis.school.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.school.domain.SchoolEvaluate;
-import com.miaxis.app.school.domain.SchoolEvaluateLabel;
-import com.miaxis.app.school.dto.SchoolEvaluateDto;
+import com.miaxis.school.domain.SchoolEvaluate;
+import com.miaxis.school.domain.SchoolEvaluateLabel;
+import com.miaxis.school.dto.SchoolEvaluateDto;
 import com.miaxis.common.core.domain.Response;
 
 import java.util.List;
 
 /**
  * 驾校评价Service接口
- * 
+ *
  * @author wwl
  * @date 2020-12-28
  */

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolInfoService.java → hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolInfoService.java

@@ -1,24 +1,24 @@
-package com.miaxis.app.school.service;
+package com.miaxis.school.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.school.domain.SchoolInfo;
-import com.miaxis.app.school.dto.SchoolInfoDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalVO;
-import com.miaxis.app.school.dto.SchoolInfoVO;
+import com.miaxis.school.domain.SchoolInfo;
+import com.miaxis.school.dto.SchoolInfoDTO;
+import com.miaxis.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.school.dto.SchoolInfoEvalVO;
+import com.miaxis.school.dto.SchoolInfoVO;
 
 import java.util.List;
 
 /**
  * 驾校Service接口
- * 
+ *
  * @author miaxis
  * @date 2020-12-24
  */
 public interface ISchoolInfoService extends IService<SchoolInfo>{
     /**
      * 查询驾校
-     * 
+     *
      * @param inscode 驾校ID
      * @return 驾校
      */
@@ -26,7 +26,7 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
 
     /**
      * 查询驾校列表
-     * 
+     *
      * @param schoolInfo 驾校
      * @return 驾校集合
      */
@@ -51,7 +51,7 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
 
     /**
      * 新增驾校
-     * 
+     *
      * @param schoolInfo 驾校
      * @return 结果
      */
@@ -59,7 +59,7 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
 
     /**
      * 修改驾校
-     * 
+     *
      * @param schoolInfo 驾校
      * @return 结果
      */
@@ -67,7 +67,7 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
 
     /**
      * 批量删除驾校
-     * 
+     *
      * @param inscodes 需要删除的驾校ID
      * @return 结果
      */
@@ -75,7 +75,7 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
 
     /**
      * 删除驾校信息
-     * 
+     *
      * @param inscode 驾校ID
      * @return 结果
      */

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolRegionService.java → hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolRegionService.java

@@ -1,13 +1,13 @@
-package com.miaxis.app.school.service;
+package com.miaxis.school.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.school.domain.SchoolRegion;
 
 import java.util.List;
 
 /**
  * 驾校训练场Service接口
- * 
+ *
  * @author zhangbin
  * @date 2020-12-28
  */

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolClassTypeServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolClassTypeServiceImpl.java

@@ -1,12 +1,12 @@
-package com.miaxis.app.school.service.impl;
+package com.miaxis.school.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.school.domain.SchoolClassType;
-import com.miaxis.app.school.mapper.SchoolClassTypeMapper;
-import com.miaxis.app.school.service.ISchoolClassTypeService;
+import com.miaxis.school.domain.SchoolClassType;
+import com.miaxis.school.mapper.SchoolClassTypeMapper;
+import com.miaxis.school.service.ISchoolClassTypeService;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolEvaluateImagesServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolEvaluateImagesServiceImpl.java

@@ -1,10 +1,10 @@
-package com.miaxis.app.school.service.impl;
+package com.miaxis.school.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.school.domain.SchoolEvaluateImages;
-import com.miaxis.app.school.mapper.SchoolEvaluateImagesMapper;
-import com.miaxis.app.school.service.ISchoolEvaluateImagesService;
+import com.miaxis.school.domain.SchoolEvaluateImages;
+import com.miaxis.school.mapper.SchoolEvaluateImagesMapper;
+import com.miaxis.school.service.ISchoolEvaluateImagesService;
 import org.springframework.stereotype.Service;
 
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolEvaluateServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolEvaluateServiceImpl.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.school.service.impl;
+package com.miaxis.school.service.impl;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.school.domain.SchoolEvaluate;
-import com.miaxis.app.school.domain.SchoolEvaluateImages;
-import com.miaxis.app.school.domain.SchoolEvaluateLabel;
-import com.miaxis.app.school.dto.SchoolEvaluateDto;
-import com.miaxis.app.school.mapper.SchoolEvaluateLabelMapper;
-import com.miaxis.app.school.mapper.SchoolEvaluateMapper;
-import com.miaxis.app.school.service.ISchoolEvaluateImagesService;
-import com.miaxis.app.school.service.ISchoolEvaluateService;
+import com.miaxis.school.domain.SchoolEvaluate;
+import com.miaxis.school.domain.SchoolEvaluateImages;
+import com.miaxis.school.domain.SchoolEvaluateLabel;
+import com.miaxis.school.dto.SchoolEvaluateDto;
+import com.miaxis.school.mapper.SchoolEvaluateLabelMapper;
+import com.miaxis.school.mapper.SchoolEvaluateMapper;
+import com.miaxis.school.service.ISchoolEvaluateImagesService;
+import com.miaxis.school.service.ISchoolEvaluateService;
 import com.miaxis.common.core.domain.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolInfoServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolInfoServiceImpl.java

@@ -1,19 +1,18 @@
-package com.miaxis.app.school.service.impl;
+package com.miaxis.school.service.impl;
 
 import java.util.List;
-import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.school.dto.SchoolInfoDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.app.school.dto.SchoolInfoEvalVO;
-import com.miaxis.app.school.dto.SchoolInfoVO;
+import com.miaxis.school.dto.SchoolInfoDTO;
+import com.miaxis.school.dto.SchoolInfoEvalDTO;
+import com.miaxis.school.dto.SchoolInfoEvalVO;
+import com.miaxis.school.dto.SchoolInfoVO;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.app.school.mapper.SchoolInfoMapper;
-import com.miaxis.app.school.domain.SchoolInfo;
-import com.miaxis.app.school.service.ISchoolInfoService;
+import com.miaxis.school.mapper.SchoolInfoMapper;
+import com.miaxis.school.domain.SchoolInfo;
+import com.miaxis.school.service.ISchoolInfoService;
 
 /**
  * 驾校Service业务层处理

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolRegionServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolRegionServiceImpl.java

@@ -1,11 +1,11 @@
-package com.miaxis.app.school.service.impl;
+package com.miaxis.school.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.school.domain.SchoolRegion;
-import com.miaxis.app.school.mapper.SchoolRegionMapper;
-import com.miaxis.app.school.service.ISchoolRegionService;
+import com.miaxis.school.domain.SchoolRegion;
+import com.miaxis.school.mapper.SchoolRegionMapper;
+import com.miaxis.school.service.ISchoolRegionService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/sms/ISmsService.java → hzgzpt-service/src/main/java/com/miaxis/sms/ISmsService.java

@@ -1,6 +1,6 @@
-package com.miaxis.app.sms;
+package com.miaxis.sms;
 
-import com.miaxis.app.sms.domain.SmsParameter;
+import com.miaxis.sms.domain.SmsParameter;
 import com.miaxis.common.core.domain.Response;
 
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/sms/domain/SmsParameter.java → hzgzpt-service/src/main/java/com/miaxis/sms/domain/SmsParameter.java

@@ -1,6 +1,5 @@
-package com.miaxis.app.sms.domain;
+package com.miaxis.sms.domain;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;

hzgzpt-service-app/src/main/java/com/miaxis/app/sms/impl/SmsServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/sms/impl/SmsServiceImpl.java

@@ -1,7 +1,7 @@
-package com.miaxis.app.sms.impl;
+package com.miaxis.sms.impl;
 
-import com.miaxis.app.sms.ISmsService;
-import com.miaxis.app.sms.domain.SmsParameter;
+import com.miaxis.sms.ISmsService;
+import com.miaxis.sms.domain.SmsParameter;
 import com.miaxis.common.constant.SmsTemplateConstants;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.exception.CustomException;

hzgzpt-service-app/src/main/java/com/miaxis/app/test/Impl/TestServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/test/Impl/TestServiceImpl.java

@@ -1,6 +1,6 @@
-package com.miaxis.app.test.Impl;
+package com.miaxis.test.Impl;
 
-import com.miaxis.app.test.inf.ITestService;
+import com.miaxis.test.inf.ITestService;
 import com.miaxis.common.sign.*;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;

hzgzpt-service-app/src/main/java/com/miaxis/app/test/inf/ITestService.java → hzgzpt-service/src/main/java/com/miaxis/test/inf/ITestService.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.test.inf;
+package com.miaxis.test.inf;
 
 import java.io.File;
 

hzgzpt-service-app/src/main/java/com/miaxis/app/train/controller/TMTrainRecordController.java → hzgzpt-service/src/main/java/com/miaxis/train/controller/TMTrainRecordController.java

@@ -1,7 +1,7 @@
-package com.miaxis.app.train.controller;
+package com.miaxis.train.controller;
 
-import com.miaxis.app.train.domain.TMTrainRecord;
-import com.miaxis.app.train.service.ITMTrainRecordService;
+import com.miaxis.train.domain.TMTrainRecord;
+import com.miaxis.train.service.ITMTrainRecordService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;

hzgzpt-service-app/src/main/java/com/miaxis/app/train/domain/TMTrainRecord.java → hzgzpt-service/src/main/java/com/miaxis/train/domain/TMTrainRecord.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.train.domain;
+package com.miaxis.train.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

hzgzpt-service-app/src/main/java/com/miaxis/app/train/mapper/TMTrainRecordMapper.java → hzgzpt-service/src/main/java/com/miaxis/train/mapper/TMTrainRecordMapper.java

@@ -1,8 +1,7 @@
-package com.miaxis.app.train.mapper;
+package com.miaxis.train.mapper;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.train.domain.TMTrainRecord;
+import com.miaxis.train.domain.TMTrainRecord;
 
 /**
  * 训练明细（终端上次明细）Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/train/service/ITMTrainRecordService.java → hzgzpt-service/src/main/java/com/miaxis/train/service/ITMTrainRecordService.java

@@ -1,7 +1,7 @@
-package com.miaxis.app.train.service;
+package com.miaxis.train.service;
 
 import java.util.List;
-import com.miaxis.app.train.domain.TMTrainRecord;
+import com.miaxis.train.domain.TMTrainRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

hzgzpt-service-app/src/main/java/com/miaxis/app/train/service/impl/TMTrainRecordServiceImpl.java → hzgzpt-service/src/main/java/com/miaxis/train/service/impl/TMTrainRecordServiceImpl.java

@@ -1,16 +1,14 @@
-package com.miaxis.app.train.service.impl;
+package com.miaxis.train.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
-import com.miaxis.app.train.mapper.TMTrainRecordMapper;
-import com.miaxis.app.train.domain.TMTrainRecord;
-import com.miaxis.app.train.service.ITMTrainRecordService;
+import com.miaxis.train.mapper.TMTrainRecordMapper;
+import com.miaxis.train.domain.TMTrainRecord;
+import com.miaxis.train.service.ITMTrainRecordService;
 
 /**
  * 训练明细（终端上次明细）Service业务层处理

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/UserImages.java → hzgzpt-service/src/main/java/com/miaxis/user/domain/UserImages.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.user.domain;
+package com.miaxis.user.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/UserPay.java → hzgzpt-service/src/main/java/com/miaxis/user/domain/UserPay.java

@@ -1,20 +1,14 @@
-package com.miaxis.app.user.domain;
+package com.miaxis.user.domain;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * 缴费对象 user_pay
  *

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/UserRegister.java → hzgzpt-service/src/main/java/com/miaxis/user/domain/UserRegister.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.user.domain;
+package com.miaxis.user.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/dto/UserDto.java → hzgzpt-service/src/main/java/com/miaxis/user/dto/UserDto.java

@@ -1,4 +1,4 @@
-package com.miaxis.app.user.dto;
+package com.miaxis.user.dto;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModelProperty;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/UserImagesMapper.java → hzgzpt-service/src/main/java/com/miaxis/user/mapper/UserImagesMapper.java

@@ -1,8 +1,8 @@
-package com.miaxis.app.user.mapper;
+package com.miaxis.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.user.domain.UserImages;
+import com.miaxis.user.domain.UserImages;
 
 /**
  * 用户照片Mapper接口

hzgzpt-service-app/src/main/java/com/miaxis/app/user/mapper/UserInfoMapper.java → hzgzpt-service/src/main/java/com/miaxis/user/mapper/UserInfoMapper.java

@@ -1,12 +1,10 @@
-package com.miaxis.app.user.mapper;
+package com.miaxis.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.user.vo.UserVo;
+import com.miaxis.user.vo.UserVo;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 用户信息Mapper接口
  *