diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..e434cb1a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +financial \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..f7443930 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..7dfdfa3a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..4b661a5f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java index 997cf8ee..97c662f8 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java @@ -23,4 +23,7 @@ public interface EmployeeControllerApi { */ @ApiOperation(value = "分页加条件查询员工信息", notes = "分页加条件查询员工信息") ResponseResult list(Integer page, Integer size, EmployeeEntity employee); + + @ApiOperation(value = "根据id删除员工信息", notes = "根据id删除员工信息") + ResponseResult delete(Long[] ids); } diff --git a/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class b/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class index a7514701..dd3c1ee4 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class and b/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class index 319b736f..dbc11e5a 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class index a5d1899a..5be81c78 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class index 67eb51e8..07ce468b 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class index 2d3241db..feb1f657 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class index 5ebd725f..11730f47 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class deleted file mode 100644 index 518270b3..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class deleted file mode 100644 index 176a6cff..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class deleted file mode 100644 index ba8a0af5..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class deleted file mode 100644 index 364a01cf..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class deleted file mode 100644 index 244e038c..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class deleted file mode 100644 index ab7598c4..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class deleted file mode 100644 index 19fe26e9..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class deleted file mode 100644 index f7c2de0c..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class deleted file mode 100644 index d35007dd..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class and /dev/null differ diff --git a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class deleted file mode 100644 index 9e78cf07..00000000 Binary files a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class and /dev/null differ diff --git a/dq-framework-common/dq-framework-common.iml b/dq-framework-common/dq-framework-common.iml deleted file mode 100644 index 11230f1a..00000000 --- a/dq-framework-common/dq-framework-common.iml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dq-framework-model/dq-framework-model.iml b/dq-framework-model/dq-framework-model.iml deleted file mode 100644 index cea872bb..00000000 --- a/dq-framework-model/dq-framework-model.iml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class index f8b09d94..7a688170 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class index 23b441cf..3dfe10d5 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class index 80699e2b..3219752b 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class index 526d0e0b..9ae841ed 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class index 5733c727..3f09bfd0 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class index 82f2579a..8338956b 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class index 84fb62db..e1bf1bad 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class index bc81dd6f..de936ba3 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class index 0943290e..f8937212 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class index d2e2db43..74f4f0f2 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class index 9bdc2d3e..6c3330fa 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class index 6a66e885..a3424160 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class index 8306bc71..652a3e21 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class index a47676ef..89cb0b38 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class index 3e30fb0e..23303c6e 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class index d71b86b3..d207a43c 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class index d8c65b98..ce466ac3 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class index d5477484..d33dd995 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class index e2fe2c57..51975224 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class index 1ecb5100..25418f74 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class index 337cf0f5..75d1523f 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class index 774faa19..cab19553 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class index 6cb3517d..3dab225b 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class index 9c07c003..176613cb 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class index 98407753..17080d31 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class index ab50858c..3d34da44 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class index d72e152c..00e170be 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class index af75c48c..bfc68efc 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class index 7a9d45f6..b76c833e 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class index fc4e85f1..4ea59cdd 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class index 97d00bbb..01a6aafd 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class index f264f41c..826e19d8 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class differ diff --git a/dq-framework-utils/dq-framework-utils.iml b/dq-framework-utils/dq-framework-utils.iml deleted file mode 100644 index bd6ca41b..00000000 --- a/dq-framework-utils/dq-framework-utils.iml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dq-framework-utils/pom.xml b/dq-framework-utils/pom.xml index 2adf930b..7f0d0315 100644 --- a/dq-framework-utils/pom.xml +++ b/dq-framework-utils/pom.xml @@ -42,5 +42,11 @@ easyexcel 1.1.2-beta4 + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.37 + compile + \ No newline at end of file diff --git a/dq-framework-utils/target/classes/META-INF/dq-framework-utils.kotlin_module b/dq-framework-utils/target/classes/META-INF/dq-framework-utils.kotlin_module deleted file mode 100644 index 8fb60192..00000000 Binary files a/dq-framework-utils/target/classes/META-INF/dq-framework-utils.kotlin_module and /dev/null differ diff --git a/dq-financial-api/dq-financial-api.iml b/dq-govern-gateway/dq-govern-gateway.iml similarity index 74% rename from dq-financial-api/dq-financial-api.iml rename to dq-govern-gateway/dq-govern-gateway.iml index ee26d26e..99f60a52 100644 --- a/dq-financial-api/dq-financial-api.iml +++ b/dq-govern-gateway/dq-govern-gateway.iml @@ -1,20 +1,11 @@ - + - - - - - - - - - - + @@ -25,9 +16,8 @@ - + - @@ -36,14 +26,14 @@ - - - - - - - - + + + + + + + + @@ -55,54 +45,90 @@ - + + - - - - - - - - - - - + + + + - + + - - - + + - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111,52 +137,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + +