zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252 Commits 1 Branch 0 Tags
fed8fa3ce13c66c7149fdfd02eaf41fca5ca7648
Commit Graph
252 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ctw fed8fa3ce1 调整 2025-01-23 14:55:53 +08:00
ctw 5d4a422285 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud 2025-01-23 14:29:15 +08:00
ctw f484b5088a 修改部门树组件 2025-01-23 14:29:06 +08:00
dzc ec29b18fca feat:部门交易金额导出 2025-01-23 14:22:16 +08:00
dzc abdaa1a557 feat:部门交易记录 2025-01-23 13:12:18 +08:00
dzc a264f8abff feat:钱包导出 2025-01-23 10:03:37 +08:00
dzc 58d290ebb3 fix:钱包bug 2025-01-22 21:13:52 +08:00
dzc 075cb570c5 feat:退款 2025-01-22 21:04:09 +08:00
dzc 7bab0e2cf5 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud 2025-01-22 19:54:15 +08:00
ctw 3dd000ced5 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud 2025-01-22 19:54:06 +08:00
dzc bba6c00070 feat:后台退款 2025-01-22 19:54:02 +08:00
ctw 240a964b1c 购物车添加合计 2025-01-22 19:54:00 +08:00
zjf 8292325f02 修改超市 2025-01-22 18:22:52 +08:00
zjf 84e11a2c2d Merge remote-tracking branch 'origin/master' 2025-01-22 16:56:32 +08:00
zjf b615637843 修改超市 2025-01-22 16:56:07 +08:00
dzc 6a337166e0 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud 2025-01-22 16:00:35 +08:00
dzc a4d2e10387 导出 2025-01-22 16:00:31 +08:00
ctw dcd24f0ff3 布局修改 2025-01-22 15:58:45 +08:00
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