 ctw
|
5f2f63b5eb
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-22 15:44:27 +08:00 |
|
|
ctw
|
d5ffb3066e
|
修改
|
2025-01-22 15:44:18 +08:00 |
|
|
ctw
|
78abd90f54
|
优化订单记录表格行尾自定义合计
|
2025-01-22 15:16:46 +08:00 |
|
 dzc
|
49b7fce82f
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-22 14:52:36 +08:00 |
|
|
dzc
|
040ec9d82c
|
feat:设备交易记录、商户交易记录导出
|
2025-01-22 14:52:32 +08:00 |
|
 zjf
|
21ee680405
|
Merge remote-tracking branch 'origin/master'
|
2025-01-22 12:03:53 +08:00 |
|
|
zjf
|
b97322e6e1
|
修改
|
2025-01-22 12:03:35 +08:00 |
|
|
dzc
|
d14c139e7d
|
设备交易记录、商户交易记录
|
2025-01-22 11:49:53 +08:00 |
|
|
dzc
|
4919f9a5cf
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-22 10:12:13 +08:00 |
|
|
dzc
|
84a864159c
|
设备交易记录、商户交易记录
|
2025-01-22 10:11:43 +08:00 |
|
|
ctw
|
f8fbd94cfc
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-22 10:10:10 +08:00 |
|
|
ctw
|
d41f62dde8
|
订单记录表格行尾添加自定义合计
|
2025-01-22 10:09:45 +08:00 |
|
|
zjf
|
6a9bf09ee5
|
1
|
2025-01-21 20:46:31 +08:00 |
|
|
zjf
|
d3345298b7
|
线上配置
|
2025-01-21 20:29:48 +08:00 |
|
|
dzc
|
8102361689
|
feat:消费、退款、充值导出
|
2025-01-21 19:13:10 +08:00 |
|
|
dzc
|
4d589c2a9f
|
fix:冲突
|
2025-01-21 17:31:19 +08:00 |
|
|
dzc
|
99e13cf104
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
# Conflicts:
# src/views/admin/system/user/face-manage.vue
|
2025-01-21 17:28:50 +08:00 |
|
|
dzc
|
ea781de349
|
feat:分配权限
|
2025-01-21 17:27:27 +08:00 |
|
|
ctw
|
8cfb59e9a6
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-21 17:02:45 +08:00 |
|
|
ctw
|
bb4d31b494
|
封装树形组件
|
2025-01-21 17:02:37 +08:00 |
|
|
zjf
|
daf6767bbd
|
整理
|
2025-01-21 16:54:02 +08:00 |
|
|
zjf
|
5b8679256a
|
整理
|
2025-01-21 16:47:19 +08:00 |
|
|
dzc
|
573d25adcc
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-21 11:07:48 +08:00 |
|
|
dzc
|
eafe75484f
|
feat:审核时间
|
2025-01-21 11:07:45 +08:00 |
|
|
ctw
|
738d76247d
|
用户管理重置查询时取消部门树形数据选中的状态
|
2025-01-21 09:52:53 +08:00 |
|
|
dzc
|
e55aadc127
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-21 09:11:29 +08:00 |
|
|
dzc
|
bb0317fbc8
|
feat:充值流水分页
|
2025-01-21 09:11:25 +08:00 |
|
|
ctw
|
fdde0bee85
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-20 21:04:29 +08:00 |
|
|
ctw
|
cad822e674
|
移除终止流程
|
2025-01-20 21:04:20 +08:00 |
|
|
dzc
|
dd6082e521
|
feat:充值流水统计
|
2025-01-20 20:30:36 +08:00 |
|
|
dzc
|
1832ab74d5
|
feat:申请按钮权限
|
2025-01-20 17:06:04 +08:00 |
|
|
ctw
|
d847967ef8
|
修改
|
2025-01-20 16:05:30 +08:00 |
|
|
ctw
|
378bc6a659
|
修改
|
2025-01-20 16:02:59 +08:00 |
|
|
dzc
|
db6b0ac96d
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
# Conflicts:
# src/views/wallet/wallet-recharge-apply/preview-excel.vue
|
2025-01-20 15:57:28 +08:00 |
|
|
dzc
|
eb295d35f9
|
feat:申请备注
|
2025-01-20 15:56:50 +08:00 |
|
|
ctw
|
6c2e9b60a4
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-20 15:11:48 +08:00 |
|
|
ctw
|
ad53819215
|
修改
|
2025-01-20 15:11:43 +08:00 |
|
|
zjf
|
fa7829c6ab
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .env.development
|
2025-01-20 11:27:09 +08:00 |
|
|
zjf
|
f23553686f
|
登录页
|
2025-01-20 11:26:35 +08:00 |
|
|
ctw
|
491eaed6ae
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-20 10:29:54 +08:00 |
|
|
ctw
|
fad6c2a6d3
|
钱包数据表格行尾合计
|
2025-01-20 10:29:47 +08:00 |
|
|
dzc
|
9bf7f7af6d
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 21:19:30 +08:00 |
|
|
dzc
|
ebff17f4ab
|
fix：修改
|
2025-01-19 21:19:24 +08:00 |
|
|
ctw
|
8aeae2cb89
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 17:42:02 +08:00 |
|
|
ctw
|
6dfeb5a9e2
|
每次菜品选择添加点击行选择
|
2025-01-19 17:41:56 +08:00 |
|
|
dzc
|
e2988f7354
|
fix:去掉邮箱必填
|
2025-01-19 16:43:12 +08:00 |
|
|
dzc
|
c0d9b6a7b1
|
fix:人员查询bug修改
|
2025-01-19 16:18:27 +08:00 |
|
|
dzc
|
238776cd2c
|
feat:用户根据当前部门和当前部门及其子部门查询
|
2025-01-19 15:50:26 +08:00 |
|
|
ctw
|
26045f9a28
|
Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
|
2025-01-19 15:34:51 +08:00 |
|
|
ctw
|
7f48dbbc1c
|
添加查全部
|
2025-01-19 15:34:44 +08:00 |
|