Commit Graph
678 Commits
Author SHA1 Message Date
dzc 1ca9ee31ee Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-04-01 19:02:20 +08:00
dzc ca94dbafa9 11 2025-04-01 19:02:15 +08:00
zjf 977e3c02e8 Merge remote-tracking branch 'origin/master' 2025-04-01 18:49:46 +08:00
zjf 0d3d68c026 单点日志字段添加 2025-04-01 18:49:28 +08:00
dzc d25e92460a Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-04-01 18:29:40 +08:00
dzc 8824440446 feat:转账退款完成 2025-04-01 18:29:33 +08:00
weiwei a7a910b2f3 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-04-01 15:37:18 +08:00
weiwei 7fa9d6adbd 钱包充值钱包类型可选 2025-04-01 15:37:03 +08:00
dzc 2fab79f954 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-04-01 12:56:55 +08:00
dzc f3cf7a5054 feat:默认选中 2025-04-01 12:56:51 +08:00
zjf e25aadb429 单点日志 2025-03-31 18:19:36 +08:00
weiwei 4f81f8bdc3 修改 2025-03-31 17:14:24 +08:00
weiwei 5e6d17b729 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-31 16:35:46 +08:00
weiwei 7b75d9c1c7 流程修改 2025-03-31 16:35:41 +08:00
dzc f243e0330a Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
# Conflicts:
#	.env.development
2025-03-31 12:33:44 +08:00
dzc 6e6e16d890 feat:用户删除 2025-03-31 12:33:22 +08:00
weiwei 2a6b21be7c Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-31 11:09:27 +08:00
weiwei 217968cd63 超市审批相关编辑方案和按钮权限修改 2025-03-31 11:09:15 +08:00
weiwei 1b0c1d8b0a 1 2025-03-31 09:58:27 +08:00
dzc 1a7ee59be7 feat:钱包转账记录页面 2025-03-30 20:23:16 +08:00
dzc d8c6131f65 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-30 19:52:14 +08:00
dzc 0bb6a90c9a feat:钱包规则 2025-03-30 19:52:09 +08:00
weiwei be3411c09e 1 2025-03-29 20:48:15 +08:00
weiwei d7c567ac99 修改 2025-03-29 20:35:59 +08:00
dzc 4db372e852 111 2025-03-29 18:27:30 +08:00
dzc d8cf18efb7 feat:商户规则绑定 2025-03-29 18:05:09 +08:00
weiwei 1f08b2eb8f Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-29 16:58:20 +08:00
weiwei 7c6cdbee42 1 2025-03-29 16:58:14 +08:00
dzc 1919507433 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-29 16:35:05 +08:00
dzc 5c67785e2c 111 2025-03-29 16:35:00 +08:00
weiwei 8fc7beb476 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-29 16:34:46 +08:00
weiwei fde7dba029 1 2025-03-29 16:34:33 +08:00
dzc 42d3e93adb Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-29 15:32:59 +08:00
dzc a9405cff68 11 2025-03-29 15:32:55 +08:00
weiwei 4d3bed7061 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-29 15:32:28 +08:00
weiwei 568e8d150e 1 2025-03-29 15:32:14 +08:00
dzc 22b2ae56f7 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-29 11:49:27 +08:00
dzc 7da1bb9a05 封装钱包规则下拉框 2025-03-29 11:49:20 +08:00
weiwei 4557ba18cf 商户二级修改 2025-03-29 11:48:14 +08:00
weiwei cdaef31ed7 修改 2025-03-29 11:11:43 +08:00
weiwei c23f369a77 1 2025-03-28 22:16:59 +08:00
weiwei 50cadab0eb 1 2025-03-28 21:47:23 +08:00
weiwei 303b40453f Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 21:40:15 +08:00
weiwei 4db91b7f62 1 2025-03-28 21:40:02 +08:00
dzc c4f8c8b356 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 20:50:47 +08:00
dzc 96474bee0b 11 2025-03-28 20:50:23 +08:00
weiwei 4f40fcae93 商户二级 2025-03-28 20:48:51 +08:00
dzc 192f8b8dca Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
# Conflicts:
#	src/views/wallet/mch-manage/form.vue
#	src/views/wallet/mch-manage/index.vue
2025-03-28 19:59:17 +08:00
weiwei a6952ce49f Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 19:54:43 +08:00
weiwei 4d637a6b2b 商户二级信息表单 2025-03-28 19:53:31 +08:00