Merge branch 'dev' into report

# Conflicts: # src/views/system/Sdb/SdbCashier/index.vue # src/views/system/houseRental/index.vue
2026-08-14 15:05:47 +08:00
parent 6ac733cdd2 3fa96351d7
commit 0dfd541769
43 changed files with 844 additions and 386 deletions
--- a/src/utils/Reg.ts
+++ b/src/utils/Reg.ts
@@ -23,6 +23,8 @@ const reg = {
  passport: /^[EG]\d{8}$/,
  /** 港澳通行证 */
  hongkongPassport: /^[CHMW]\d{8}$/,
+  /** 微信 */
+  vx: /^[a-zA-Z][a-zA-Z0-9_-]{5,19}$/,
  /** 年龄 */
  age: /^[0-9]\d{0,2}$/,
  /** 数字 */