commit

crm-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +1 @@
-D:\code\crm-backend-matt\crm-app\src\main\java\com\crm\app\CrmAppApplication.java
+E:\code\crm-backend-matt\crm-app\src\main\java\com\crm\app\CrmAppApplication.java

crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -69,7 +69,6 @@ com\crm\auth\security\PermissionResolverImpl.class
 com\crm\auth\mapper\SysUserDeptMapper.class
 com\crm\auth\security\SecurityExceptionHandlers.class
 com\crm\auth\AuthApplication.class
-com\crm\auth\domain\enums\MenuType$1.class
 com\crm\auth\mapper\SysUserRoleMapper.class
 com\crm\auth\domain\entity\SysRole.class
 com\crm\auth\mapper\SysDeptMapper.class

crm-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,72 +1,72 @@
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\AuthApplication.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\AuthApplication.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\AuthProperties.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\AuthProperties.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\DataInitializer.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\DataInitializer.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\PermissionConfig.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\PermissionConfig.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\SecurityConfig.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\SecurityConfig.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\WebMvcConfig.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\config\WebMvcConfig.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\constant\AuthConstants.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\constant\AuthConstants.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\AuthController.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\AuthController.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\DebugTokenController.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\DebugTokenController.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\ResourceController.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\ResourceController.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\RoleController.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\RoleController.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\SystemController.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\controller\SystemController.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\LoginResultDTO.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\LoginResultDTO.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\ResourceNode.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\ResourceNode.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\RoleDetailVO.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\RoleDetailVO.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\UserInfoDTO.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\UserInfoDTO.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\UserListDTO.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\UserListDTO.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\UserStatsVO.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\dto\UserStatsVO.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\AuthIdentity.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\AuthIdentity.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\AuthUser.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\AuthUser.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysDept.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysDept.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysMenu.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysMenu.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysRole.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysRole.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysRoleMenu.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysRoleMenu.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysUserDept.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysUserDept.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysUserRole.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\entity\SysUserRole.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\enums\DataScopeEnum.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\enums\DataScopeEnum.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\enums\IdentityTypeEnum.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\enums\IdentityTypeEnum.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\enums\MenuType.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\enums\MenuType.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\param\UserPageParam.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\domain\param\UserPageParam.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\AuthIdentityMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\AuthIdentityMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\AuthUserMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\AuthUserMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysDeptMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysDeptMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysMenuMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysMenuMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysRoleMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysRoleMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysRoleMenuMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysRoleMenuMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysUserDeptMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysUserDeptMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysUserRoleMapper.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\mapper\SysUserRoleMapper.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\ApiPermissionCache.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\ApiPermissionCache.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\ApiPermissionInterceptor.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\ApiPermissionInterceptor.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\ApiPermissionRule.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\ApiPermissionRule.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\AuthLoginUser.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\AuthLoginUser.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\DataScopeInterceptor.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\DataScopeInterceptor.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\DataScopeTables.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\DataScopeTables.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\JwtAuthenticationFilter.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\JwtAuthenticationFilter.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\PermissionGrant.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\PermissionGrant.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\PermissionResolver.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\PermissionResolver.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\PermissionResolverImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\PermissionResolverImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\SecurityExceptionHandlers.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\SecurityExceptionHandlers.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\TokenService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\security\TokenService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\DingTalkAuthClient.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\DingTalkAuthClient.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\ThirdPartyAuthClient.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\ThirdPartyAuthClient.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\ThirdPartyAuthClientFactory.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\ThirdPartyAuthClientFactory.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\ThirdPartyUserInfo.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\client\ThirdPartyUserInfo.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\DeptTreeCache.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\DeptTreeCache.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IAuthIdentityService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IAuthIdentityService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IAuthService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IAuthService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IAuthUserService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IAuthUserService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthIdentityServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthIdentityServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthUserServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\AuthUserServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\PermissionSeederImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\PermissionSeederImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\ResourceServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\ResourceServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysDeptServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysDeptServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysMenuServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysMenuServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysRoleServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\SysRoleServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\UserQueryServiceImpl.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\impl\UserQueryServiceImpl.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IResourceService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IResourceService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysDeptService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysDeptService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysMenuService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysMenuService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysRoleService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\ISysRoleService.java
-D:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IUserQueryService.java
+E:\code\crm-backend-matt\crm-auth\src\main\java\com\crm\auth\service\IUserQueryService.java

crm-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,17 +0,0 @@
-com\crm\auth\service\client\DingTalkAuthClientTest.class
-com\crm\auth\service\client\ThirdPartyAuthClientFactoryTest.class
-com\crm\auth\service\impl\SysDeptServiceImplTest.class
-com\crm\auth\security\scope\TestOwnedDataMapper.class
-com\crm\auth\security\scope\TestOwnedData.class
-com\crm\auth\service\impl\UserListIntegrationTest.class
-com\crm\auth\service\client\DingTalkAuthClientTest$StubbedClient.class
-com\crm\auth\service\impl\SysMenuServiceImplTest.class
-com\crm\auth\security\ApiPermissionInterceptorTest.class
-com\crm\auth\service\impl\PermissionSeederImplTest.class
-com\crm\auth\security\scope\DataScopeIntegrationTest.class
-com\crm\auth\service\impl\AuthServiceImplTest.class
-com\crm\auth\service\client\ThirdPartyAuthClientFactoryTest$StubClient.class
-com\crm\auth\service\impl\ResourceServiceImplTest.class
-com\crm\auth\service\impl\SysRoleServiceImplTest.class
-com\crm\auth\security\scope\DataScopeIntegrationTest$DeptQueryCounter.class
-com\crm\auth\service\impl\AuthUserServiceImplTest.class

crm-auth/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,14 +0,0 @@
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\security\ApiPermissionInterceptorTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\security\scope\DataScopeIntegrationTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\security\scope\TestOwnedData.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\security\scope\TestOwnedDataMapper.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\client\DingTalkAuthClientTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\client\ThirdPartyAuthClientFactoryTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\AuthServiceImplTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\AuthUserServiceImplTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\PermissionSeederImplTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\ResourceServiceImplTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\SysDeptServiceImplTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\SysMenuServiceImplTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\SysRoleServiceImplTest.java
-D:\code\crm-backend-matt\crm-auth\src\test\java\com\crm\auth\service\impl\UserListIntegrationTest.java

crm-auth/target/surefire-reports/com.crm.auth.security.scope.DataScopeIntegrationTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.crm.auth.security.scope.DataScopeIntegrationTest
--------------------------------------------------------------------------------
-Tests run: 28, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.906 s -- in com.crm.auth.security.scope.DataScopeIntegrationTest

crm-auth/target/surefire-reports/com.crm.auth.service.client.DingTalkAuthClientTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.crm.auth.service.client.DingTalkAuthClientTest
--------------------------------------------------------------------------------
-Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.749 s -- in com.crm.auth.service.client.DingTalkAuthClientTest

crm-auth/target/surefire-reports/com.crm.auth.service.client.ThirdPartyAuthClientFactoryTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.crm.auth.service.client.ThirdPartyAuthClientFactoryTest
--------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.029 s -- in com.crm.auth.service.client.ThirdPartyAuthClientFactoryTest

crm-auth/target/surefire-reports/com.crm.auth.service.impl.AuthServiceImplTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.crm.auth.service.impl.AuthServiceImplTest
--------------------------------------------------------------------------------
-Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.025 s -- in com.crm.auth.service.impl.AuthServiceImplTest

crm-auth/target/surefire-reports/com.crm.auth.service.impl.AuthUserServiceImplTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.crm.auth.service.impl.AuthUserServiceImplTest
--------------------------------------------------------------------------------
-Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.336 s -- in com.crm.auth.service.impl.AuthUserServiceImplTest

crm-auth/target/surefire-reports/com.crm.auth.service.impl.SysDeptServiceImplTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.crm.auth.service.impl.SysDeptServiceImplTest
--------------------------------------------------------------------------------
-Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.119 s -- in com.crm.auth.service.impl.SysDeptServiceImplTest

crm-auth/target/surefire-reports/com.crm.auth.service.impl.UserListIntegrationTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.crm.auth.service.impl.UserListIntegrationTest
--------------------------------------------------------------------------------
-Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.532 s -- in com.crm.auth.service.impl.UserListIntegrationTest

crm-base/src/main/java/com/crm/base/advice/GlobalDataBindingAdvice.java

@@ -0,0 +1,32 @@
+package com.crm.base.advice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.InitBinder;
+
+/**
+ * 全局数据绑定防护（mass assignment 防御）
+ * <p>通过 {@link WebDataBinder#setDisallowedFields(String...)} 在入参侧全局 strip
+ * 服务端裁定字段，防止客户端通过表单伪造 createTime / updateTime / creatorId / updaterId /
+ * deleted / builtin（ADR-0017 Route A 安全替代）</p>
+ * <p>DTO 上有 createTime / updateTime（出参展示用），但绑定器拒绝从表单填入。
+ * Spring 对目标类上不存在的字段会静默跳过，所以全局列表不会引发绑定错误。</p>
+ * <p>新增服务端裁定字段时必须同步更新 {@link #DISALLOWED_FIELDS} 列表。</p>
+ *
+ * @see com.crm.base.domain.dto.BaseDTO
+ */
+@Slf4j
+@ControllerAdvice
+public class GlobalDataBindingAdvice {
+
+    /** 服务端裁定字段，禁止客户端通过表单写入 */
+    private static final String[] DISALLOWED_FIELDS = {
+            "createTime", "updateTime", "creatorId", "updaterId", "deleted", "builtin"
+    };
+
+    @InitBinder
+    public void disallowServerManagedFields(WebDataBinder binder) {
+        binder.setDisallowedFields(DISALLOWED_FIELDS);
+    }
+}

crm-base/src/test/java/com/crm/base/advice/GlobalDataBindingAdviceTest.java

@@ -0,0 +1,107 @@
+package com.crm.base.advice;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.bind.WebDataBinder;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * 全局 mass assignment 防护测试（ADR-0017 ticket 02）
+ *
+ * <p>验证 {@link GlobalDataBindingAdvice#disallowServerManagedFields(WebDataBinder)}
+ * 配置的 {@code setDisallowedFields} 列表能正确 strip 服务端裁定字段，
+ * 同时不影响正常字段的绑定。</p>
+ */
+class GlobalDataBindingAdviceTest {
+
+    /** 测试用 DTO，含一个服务端裁定字段（createTime）和一个正常字段（builtin）和一个普通字段（name） */
+    static class TestDTO {
+        private Long id;
+        private String name;
+        private LocalDateTime createTime;
+        private Boolean builtin;
+
+        public Long getId() { return id; }
+        public void setId(Long id) { this.id = id; }
+        public String getName() { return name; }
+        public void setName(String name) { this.name = name; }
+        public LocalDateTime getCreateTime() { return createTime; }
+        public void setCreateTime(LocalDateTime createTime) { this.createTime = createTime; }
+        public Boolean getBuiltin() { return builtin; }
+        public void setBuiltin(Boolean builtin) { this.builtin = builtin; }
+    }
+
+    private TestDTO bind(Map<String, String> form) {
+        TestDTO target = new TestDTO();
+        WebDataBinder binder = new WebDataBinder(target);
+        // 模拟 @ControllerAdvice 的 @InitBinder 行为
+        new GlobalDataBindingAdvice().disallowServerManagedFields(binder);
+        binder.bind(new org.springframework.beans.MutablePropertyValues(form));
+        return target;
+    }
+
+    @Test
+    @DisplayName("提交 createTime 被 strip，DTO 上为 null")
+    void createTimeStripped() {
+        Map<String, String> form = new HashMap<>();
+        form.put("name", "测试角色");
+        form.put("createTime", "2026-01-01T00:00:00");
+
+        TestDTO dto = bind(form);
+
+        assertEquals("测试角色", dto.getName());
+        assertNull(dto.getCreateTime(), "createTime 应被 InitBinder strip");
+    }
+
+    @Test
+    @DisplayName("提交 builtin=true 被 strip，DTO 上为 null")
+    void builtinStripped() {
+        Map<String, String> form = new HashMap<>();
+        form.put("name", "测试角色");
+        form.put("builtin", "true");
+
+        TestDTO dto = bind(form);
+
+        assertEquals("测试角色", dto.getName());
+        assertNull(dto.getBuiltin(), "builtin 应被 InitBinder strip");
+    }
+
+    @Test
+    @DisplayName("不包含服务端裁定字段的正常表单提交不受影响")
+    void normalSubmissionUnaffected() {
+        Map<String, String> form = new HashMap<>();
+        form.put("id", "123");
+        form.put("name", "正常角色");
+
+        TestDTO dto = bind(form);
+
+        assertEquals(123L, dto.getId());
+        assertEquals("正常角色", dto.getName());
+        assertNull(dto.getCreateTime());
+        assertNull(dto.getBuiltin());
+    }
+
+    @Test
+    @DisplayName("全部 6 个服务端裁定字段同时提交均被 strip")
+    void allDisallowedFieldsStripped() {
+        Map<String, String> form = new HashMap<>();
+        form.put("name", "测试");
+        form.put("createTime", "2026-01-01T00:00:00");
+        form.put("updateTime", "2026-01-02T00:00:00");
+        form.put("creatorId", "fake-user");
+        form.put("updaterId", "fake-user");
+        form.put("deleted", "true");
+        form.put("builtin", "true");
+
+        TestDTO dto = bind(form);
+
+        assertEquals("测试", dto.getName(), "普通字段应正常绑定");
+        assertNull(dto.getCreateTime(), "createTime 应被 strip");
+        assertNull(dto.getBuiltin(), "builtin 应被 strip");
+    }
+}

crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -14,6 +14,7 @@ com\crm\base\security\DataScopeHelper.class
 com\crm\base\mapper\CrmBaseMapper.class
 com\crm\base\utils\BeanCopyUtils.class
 com\crm\base\domain\enums\StatusEnum.class
+com\crm\base\advice\GlobalDataBindingAdvice.class
 com\crm\base\config\MybatisPlusConfig.class
 com\crm\base\domain\entity\BaseEntity.class
 com\crm\base\config\CrmSqlInjector.class

crm-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,50 +1,51 @@
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\advice\GlobalExceptionHandlerAdvice.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\advice\GlobalDataBindingAdvice.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\annotation\DataScope.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\advice\GlobalExceptionHandlerAdvice.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\CorsConfig.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\annotation\DataScope.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\CrmSqlInjector.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\CorsConfig.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\CustomIdGenerator.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\CrmSqlInjector.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\InsertBatchOnDuplicateKeyUpdate.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\CustomIdGenerator.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\JacksonConfig.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\InsertBatchOnDuplicateKeyUpdate.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\Knife4jConfig.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\JacksonConfig.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\MetaObjectFillHandler.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\Knife4jConfig.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\MybatisPlusConfig.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\MetaObjectFillHandler.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\RedisConfig.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\MybatisPlusConfig.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\ScheduledTaskProperties.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\RedisConfig.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\SnowflakeIdWorker.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\ScheduledTaskProperties.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\SnowflakeProperties.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\SnowflakeIdWorker.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\constant\CommonConstants.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\config\SnowflakeProperties.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\BaseDTO.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\constant\CommonConstants.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\ButtonSeed.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\BaseDTO.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\PermissionModuleDescriptor.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\ButtonSeed.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\entity\BaseEntity.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\dto\PermissionModuleDescriptor.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\entity\OwnedEntity.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\entity\BaseEntity.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\enums\HasValueEnum.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\entity\OwnedEntity.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\enums\StatusEnum.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\enums\HasValueEnum.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\BusinessErrorException.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\enums\StatusEnum.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\MissingParameterException.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\BusinessErrorException.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\PermissionErrorException.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\MissingParameterException.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\ResourceNotExistException.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\PermissionErrorException.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\param\BaseParam.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\exception\ResourceNotExistException.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\result\PageResult.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\param\BaseParam.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\result\Result.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\result\PageResult.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\result\ResultCodeEnum.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\result\Result.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\filter\TraceIdFilter.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\domain\result\ResultCodeEnum.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\mapper\CrmBaseMapper.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\filter\TraceIdFilter.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataOwnership.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\mapper\CrmBaseMapper.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataScopeHelper.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataOwnership.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataScopeLevel.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataScopeHelper.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataVisibility.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataScopeLevel.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataVisibilityContext.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataVisibility.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\LoginUser.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\DataVisibilityContext.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\SecurityUtils.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\LoginUser.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\VisibilityScope.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\SecurityUtils.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\IBaseService.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\security\VisibilityScope.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\impl\BaseServiceImpl.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\IBaseService.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\PermissionSeeder.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\impl\BaseServiceImpl.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\AssertUtils.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\service\PermissionSeeder.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\BeanCopyUtils.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\AssertUtils.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\EnumUtils.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\BeanCopyUtils.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\ExcelUtil.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\EnumUtils.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\PageConverter.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\ExcelUtil.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\ServletUtils.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\PageConverter.java
-D:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\TreeUtils.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\ServletUtils.java
+E:\code\crm-backend-matt\crm-base\src\main\java\com\crm\base\utils\TreeUtils.java

crm-base/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1 +1,3 @@
+com\crm\base\advice\GlobalDataBindingAdviceTest$TestDTO.class
+com\crm\base\advice\GlobalDataBindingAdviceTest.class
 com\crm\base\security\DataVisibilityTest.class

crm-base/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1,2 @@
-D:\code\crm-backend-matt\crm-base\src\test\java\com\crm\base\security\DataVisibilityTest.java
+E:\code\crm-backend-matt\crm-base\src\test\java\com\crm\base\advice\GlobalDataBindingAdviceTest.java
+E:\code\crm-backend-matt\crm-base\src\test\java\com\crm\base\security\DataVisibilityTest.java

crm-base/target/surefire-reports/com.crm.base.security.DataVisibilityTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.crm.base.security.DataVisibilityTest
 -------------------------------------------------------------------------------
-Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.198 s -- in com.crm.base.security.DataVisibilityTest
+Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.060 s -- in com.crm.base.security.DataVisibilityTest

crm-dict/src/main/java/com/crm/dict/controller/DictGroupController.java

@@ -3,8 +3,7 @@ package com.crm.dict.controller;
 import com.crm.base.domain.result.PageResult;
 import com.crm.base.domain.result.Result;
 import com.crm.dict.constant.DictConstants;
-import com.crm.dict.domain.dto.DictGroupVO;
+import com.crm.dict.domain.dto.DictGroupDTO;
-import com.crm.dict.domain.entity.DictGroup;
 import com.crm.dict.domain.param.GroupPageParam;
 import com.crm.dict.service.IDictGroupService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,15 +32,15 @@ public class DictGroupController {
     @Operation(summary = "分组分页（keyword 匹配名称/编码，status 筛选）")
     @PreAuthorize("hasAuthority('" + DictConstants.PERM_GROUP_LIST + "')")
     @PostMapping("/page")
-    public Result<PageResult<DictGroupVO>> page(GroupPageParam param) {
+    public Result<PageResult<DictGroupDTO>> page(GroupPageParam param) {
         return Result.success(dictGroupService.pageGroups(param));
     }
 
     @Operation(summary = "新建/编辑分组（新建编码必填；编辑时编码/内置标记/状态只读）")
     @PreAuthorize("hasAuthority('" + DictConstants.PERM_GROUP_SAVE + "')")
     @PostMapping("/saveOrUpdate")
-    public Result<Void> saveOrUpdate(DictGroup group) {
+    public Result<Void> saveOrUpdate(DictGroupDTO dto) {
-        dictGroupService.saveGroup(group);
+        dictGroupService.saveGroup(dto);
         return Result.success();
     }
 
@@ -64,7 +63,7 @@ public class DictGroupController {
     @Operation(summary = "启用分组列表（新建字典项选分组用）")
     @PreAuthorize("hasAuthority('" + DictConstants.PERM_GROUP_LIST + "')")
     @GetMapping("/enabled-list")
-    public Result<List<DictGroup>> enabledList() {
+    public Result<List<DictGroupDTO>> enabledList() {
         return Result.success(dictGroupService.listEnabled());
     }
 }

crm-dict/src/main/java/com/crm/dict/controller/DictItemController.java

@@ -3,8 +3,7 @@ package com.crm.dict.controller;
 import com.crm.base.domain.result.PageResult;
 import com.crm.base.domain.result.Result;
 import com.crm.dict.constant.DictConstants;
-import com.crm.dict.domain.dto.DictItemVO;
+import com.crm.dict.domain.dto.DictItemDTO;
-import com.crm.dict.domain.entity.DictItem;
 import com.crm.dict.domain.param.ItemPageParam;
 import com.crm.dict.service.DictQueryService;
 import com.crm.dict.service.IDictItemService;
@@ -35,15 +34,15 @@ public class DictItemController {
     @Operation(summary = "字典项分页（groupId/keyword/status 筛选，附带默认/引用/有效可选标记）")
     @PreAuthorize("hasAuthority('" + DictConstants.PERM_ITEM_LIST + "')")
     @PostMapping("/page")
-    public Result<PageResult<DictItemVO>> page(ItemPageParam param) {
+    public Result<PageResult<DictItemDTO>> page(ItemPageParam param) {
         return Result.success(dictItemService.pageItems(param));
     }
 
     @Operation(summary = "新建/编辑字典项（新建编码空自动生成；分组/编码创建后只读；值被引用后只读）")
     @PreAuthorize("hasAuthority('" + DictConstants.PERM_ITEM_SAVE + "')")
     @PostMapping("/saveOrUpdate")
-    public Result<Void> saveOrUpdate(DictItem item) {
+    public Result<Void> saveOrUpdate(DictItemDTO dto) {
-        dictItemService.saveItem(item);
+        dictItemService.saveItem(dto);
         return Result.success();
     }
 
@@ -83,7 +82,7 @@ public class DictItemController {
     @Operation(summary = "某分组启用项列表（业务选择器渲染用，走 10s 本地缓存）")
     @PreAuthorize("hasAuthority('" + DictConstants.PERM_ITEM_LIST + "')")
     @GetMapping("/enabled-list")
-    public Result<List<DictItem>> enabledList(@RequestParam("groupCode") String groupCode) {
+    public Result<List<DictItemDTO>> enabledList(@RequestParam("groupCode") String groupCode) {
         return Result.success(dictQueryService.listEnabledItems(groupCode));
     }
 }

crm-dict/src/main/java/com/crm/dict/domain/dto/DictGroupDTO.java

@@ -0,0 +1,50 @@
+package com.crm.dict.domain.dto;
+
+import com.crm.base.domain.dto.BaseDTO;
+import com.crm.dict.domain.entity.DictGroup;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 字典分组传输对象（写入参 + 出参双向，ADR-0017 Route A）
+ * <p>继承 {@link BaseDTO} 白拿 id/createTime/updateTime；
+ * builtin 由全局 @InitBinder 在入参侧 strip，出参侧展示原值</p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DictGroupDTO extends BaseDTO {
+
+    private String name;
+
+    private String code;
+
+    private Integer sortNo;
+
+    private Integer status;
+
+    private String description;
+
+    private Boolean builtin;
+
+    @Schema(description = "分组下未删除的字典项数量（含启用+停用）")
+    private Long itemCount;
+
+    /**
+     * Entity → DTO（出参转换，Service 层调用）
+     */
+    public static DictGroupDTO fromEntity(DictGroup entity) {
+        DictGroupDTO dto = new DictGroupDTO();
+        org.springframework.beans.BeanUtils.copyProperties(entity, dto);
+        return dto;
+    }
+
+    /**
+     * DTO → Entity（入参转换，Service 层调用）
+     */
+    public DictGroup toEntity() {
+        DictGroup entity = new DictGroup();
+        org.springframework.beans.BeanUtils.copyProperties(this, entity);
+        return entity;
+    }
+}

crm-dict/src/main/java/com/crm/dict/domain/dto/DictGroupVO.java

@@ -1,34 +0,0 @@
-package com.crm.dict.domain.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 字典分组视图对象：分页列表展示用
- * <p>独立字段（不继承实体），只暴露前端需要的业务字段 + createTime，
- * 排除审计字段（creatorId/updaterId/updateTime/deleted）和软删内部字段（deleteKey）。</p>
- */
-@Data
-public class DictGroupVO {
-
-    private Long id;
-
-    private String name;
-
-    private String code;
-
-    private Integer sortNo;
-
-    private Integer status;
-
-    private String description;
-
-    private Boolean builtin;
-
-    private LocalDateTime createTime;
-
-    @Schema(description = "分组下未删除的字典项数量（含启用+停用）")
-    private Long itemCount;
-}

crm-dict/src/main/java/com/crm/dict/domain/dto/DictItemDTO.java

@@ -0,0 +1,65 @@
+package com.crm.dict.domain.dto;
+
+import com.crm.base.domain.dto.BaseDTO;
+import com.crm.dict.domain.entity.DictItem;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 字典项传输对象（写入参 + 出参双向，ADR-0017 Route A）
+ * <p>继承 {@link BaseDTO} 白拿 id/createTime/updateTime；
+ * builtin 由全局 @InitBinder 在入参侧 strip，出参侧展示原值</p>
+ * <p>referenced 读实时引用计数（绝不进缓存）；effectiveSelectable 供前端对
+ * "自身启用但所属分组已停用"的失活项做视觉标记</p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DictItemDTO extends BaseDTO {
+
+    private Long groupId;
+
+    private String name;
+
+    private String code;
+
+    private String value;
+
+    private Integer sortNo;
+
+    private Integer status;
+
+    private String description;
+
+    private Boolean builtin;
+
+    @Schema(description = "所属分组名称")
+    private String groupName;
+
+    @Schema(description = "是否为分组默认项")
+    private Boolean isDefault;
+
+    @Schema(description = "是否被业务引用（实时计数）")
+    private Boolean referenced;
+
+    @Schema(description = "是否有效可选（分组与项均启用）")
+    private Boolean effectiveSelectable;
+
+    /**
+     * Entity → DTO（出参转换，Service 层调用）
+     */
+    public static DictItemDTO fromEntity(DictItem entity) {
+        DictItemDTO dto = new DictItemDTO();
+        org.springframework.beans.BeanUtils.copyProperties(entity, dto);
+        return dto;
+    }
+
+    /**
+     * DTO → Entity（入参转换，Service 层调用）
+     */
+    public DictItem toEntity() {
+        DictItem entity = new DictItem();
+        org.springframework.beans.BeanUtils.copyProperties(this, entity);
+        return entity;
+    }
+}

crm-dict/src/main/java/com/crm/dict/domain/dto/DictItemVO.java

@@ -1,49 +0,0 @@
-package com.crm.dict.domain.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 字典项视图对象：分页列表展示用
- * <p>referenced 读实时引用计数（绝不进缓存）；effectiveSelectable 供前端对
- * "自身启用但所属分组已停用"的失活项做视觉标记。
- * 独立字段（不继承实体），只暴露前端需要的业务字段 + createTime，
- * 排除审计字段（creatorId/updaterId/updateTime/deleted）和软删内部字段（deleteKey）。</p>
- */
-@Data
-public class DictItemVO {
-
-    private Long id;
-
-    private Long groupId;
-
-    private String name;
-
-    private String code;
-
-    private String value;
-
-    private Integer sortNo;
-
-    private Integer status;
-
-    private String description;
-
-    private Boolean builtin;
-
-    private LocalDateTime createTime;
-
-    @Schema(description = "所属分组名称")
-    private String groupName;
-
-    @Schema(description = "是否为分组默认项")
-    private Boolean isDefault;
-
-    @Schema(description = "是否被业务引用（实时计数）")
-    private Boolean referenced;
-
-    @Schema(description = "是否有效可选（分组与项均启用）")
-    private Boolean effectiveSelectable;
-}

crm-dict/src/main/java/com/crm/dict/service/DictQueryService.java

@@ -1,5 +1,6 @@
 package com.crm.dict.service;
 
+import com.crm.dict.domain.dto.DictItemDTO;
 import com.crm.dict.domain.entity.DictItem;
 
 import java.util.List;
@@ -8,7 +9,7 @@ import java.util.List;
  * 字典读路径服务（业务模块读契约，ADR-0015）
  * <p><b>带 Caffeine 本地缓存</b>：10s TTL 正结果 + 2s 空结果防穿透，扛高频读；
  * 变更写入不主动 evict，接受多副本 10 秒最终一致。不含任何写方法。</p>
- * <p>注意：本服务返回的实体是缓存快照（可能滞后 10s），只可用于渲染/校验；
+ * <p>注意：本服务返回的对象是缓存快照（可能滞后 10s），只可用于渲染/校验；
  * 需要实时数据（如删除判定）请走 {@link DictReferenceService}。</p>
  */
 public interface DictQueryService {
@@ -22,7 +23,7 @@ public interface DictQueryService {
      * 某分组下的启用字典项列表（业务选择器渲染用）：只返回分组与项均启用的项；
      * 分组不存在或分组停用时返回空列表，按 sort_no 排序（空排最后）
      */
-    List<DictItem> listEnabledItems(String groupCode);
+    List<DictItemDTO> listEnabledItems(String groupCode);
 
     /**
      * 分组当前默认项：联查 group.status，分组停用（休眠）或未设默认时返回 null

crm-dict/src/main/java/com/crm/dict/service/IDictGroupService.java

@@ -2,7 +2,7 @@ package com.crm.dict.service;
 
 import com.crm.base.domain.result.PageResult;
 import com.crm.base.service.IBaseService;
-import com.crm.dict.domain.dto.DictGroupVO;
+import com.crm.dict.domain.dto.DictGroupDTO;
 import com.crm.dict.domain.entity.DictGroup;
 import com.crm.dict.domain.param.GroupPageParam;
 
@@ -16,13 +16,13 @@ public interface IDictGroupService extends IBaseService<DictGroup> {
     /**
      * 分组分页（keyword 匹配名称/编码；status 筛选；itemCount 一次聚合查询）
      */
-    PageResult<DictGroupVO> pageGroups(GroupPageParam param);
+    PageResult<DictGroupDTO> pageGroups(GroupPageParam param);
 
     /**
      * 新建/编辑分组：新建编码必填且全局唯一、builtin 强制 false、status 默认启用；
      * 编辑时编码/builtin/status 保留原值（编码创建后不可改，启停走独立端点）
      */
-    void saveGroup(DictGroup group);
+    void saveGroup(DictGroupDTO dto);
 
     /**
      * 删除分组：builtin 阻断；分组下仍有未删除字典项则阻断；软删除 + 复用键
@@ -37,5 +37,5 @@ public interface IDictGroupService extends IBaseService<DictGroup> {
     /**
      * 启用分组列表（新建字典项选分组用），按 sort_no 排序
      */
-    List<DictGroup> listEnabled();
+    List<DictGroupDTO> listEnabled();
 }