Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

# Conflicts: # packages/@core/base/shared/src/constants/dict-enum.ts
2025-06-26 22:03:17 +08:00
parent 1bc8d02cec 6f2e0be983
commit ca24234e57
62 changed files with 4940 additions and 453 deletions
--- a/packages/@core/base/shared/src/constants/dict-enum.ts
+++ b/packages/@core/base/shared/src/constants/dict-enum.ts
@@ -18,6 +18,7 @@ export const DictEnum = {

  SIS_ACCESS_CONTROL_DEVICE_TYPE: 'sis_access_control_device_type',
  SIS_LIB_TYPE: 'sis_lib_type',
+  WY_ZCSHZT: 'wy_zcshzt',
 } as const;

 export type DictEnumKey = keyof typeof DictEnum;