Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/iot

# Conflicts: # pnpm-lock.yaml
2025-06-11 21:59:45 +08:00
parent 782337952d b14df2e01b
commit 9fe69a7a9a
127 changed files with 20603 additions and 3623 deletions
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@ -159,7 +159,6 @@ export enum DICT_TYPE {
  PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
  PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
  PAY_TRANSFER_STATUS = 'pay_transfer_status', // 转账订单状态
-  PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态

  // ========== MP 模块 ==========
  MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型