woody
|
ec5fa4f7f8
|
Merge branch 'test' of http://47.94.45.65:3000/angelo/web-zk-admin into online
|
2025-10-29 11:15:05 +08:00 |
|
woody
|
529d299f63
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-29 11:14:45 +08:00 |
|
woody
|
49fbb07951
|
chore(env): update
|
2025-10-28 17:31:43 +08:00 |
|
woody
|
2e94b8f42a
|
Merge branch 'test' of http://47.94.45.65:3000/angelo/web-zk-admin into online
|
2025-10-28 17:07:57 +08:00 |
|
woody
|
56be5a5784
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-28 17:07:39 +08:00 |
|
woody
|
f6432a02ea
|
fix(onlinePayDetails): 在线支付明细订单编号列宽度调整
|
2025-10-28 17:07:27 +08:00 |
|
woody
|
b782467416
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-28 13:54:39 +08:00 |
|
woody
|
3aa9129de0
|
feat(dashboard): 看板添加会员等级的展示
|
2025-10-28 13:54:24 +08:00 |
|
woody
|
a7c221daba
|
Merge branch 'test' of http://47.94.45.65:3000/angelo/web-zk-admin into online
|
2025-10-28 13:28:25 +08:00 |
|
woody
|
716d42f10f
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-27 17:14:34 +08:00 |
|
woody
|
7954610c6f
|
feat(member): 会员信息页添加会员等级展示
|
2025-10-27 17:14:21 +08:00 |
|
woody
|
8ab13178a8
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into dev
|
2025-10-27 17:00:26 +08:00 |
|
woody
|
0295fbb6a4
|
feat(performaceTotal): 奖金专区列改名，添加赠品专区字段
|
2025-10-27 17:00:19 +08:00 |
 cabbage
|
fa33642e5b
|
## 奖金明细、奖金汇总添加赠品积分；
|
2025-10-27 15:46:32 +08:00 |
|
woody
|
a5ddb8ed41
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-24 10:23:51 +08:00 |
|
woody
|
8f6231461f
|
feat(arch): 阶段架构方案一根节点展示会员点位
|
2025-10-24 10:23:39 +08:00 |
|
woody
|
5b1f839195
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-21 14:50:15 +08:00 |
|
woody
|
bd867ce01a
|
feat(statistics): 伞下业绩默认时间段结束日期为前一天
|
2025-10-21 14:50:01 +08:00 |
|
woody
|
c3115f1ad8
|
chore(env): update app address
|
2025-10-21 11:19:26 +08:00 |
|
woody
|
c5e41f9de6
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-21 10:39:08 +08:00 |
|
woody
|
ce749c627a
|
feat(memberPoint): 列表结构调整
|
2025-10-21 10:38:57 +08:00 |
|
woody
|
6003a12032
|
Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-admin into test
|
2025-10-21 10:22:13 +08:00 |
|
woody
|
7d0d4e4b0d
|
feat(framework): 阶段架构列表返回结构变更
|
2025-10-21 10:19:39 +08:00 |
|
woody
|
5e0f6fe6c9
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-10-13 10:51:36 +08:00 |
|
cabbage
|
fa46c833ff
|
## 奖金拨比汇总；
|
2025-10-13 10:50:22 +08:00 |
|
woody
|
f7beb17524
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-10-13 09:52:02 +08:00 |
|
woody
|
3f4d198345
|
feat(performance): 顶点奖金拨比业绩时间默认昨日
|
2025-10-13 09:51:50 +08:00 |
|
woody
|
ed7f406c8a
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-10-11 17:57:07 +08:00 |
|
woody
|
9ff003c89e
|
feat(router): 注释路由配置 顶点奖金拨比业绩统计、个人伞下拨比查询
|
2025-10-11 17:56:55 +08:00 |
|
cabbage
|
efe4054e4b
|
## 奖金拨比列表；
|
2025-10-11 17:50:56 +08:00 |
|
woody
|
22c86db419
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-10-10 11:55:14 +08:00 |
|
woody
|
036d9bd65a
|
feat(xfpz): 消费配置列表列宽调整，会员信息列顺序调整
|
2025-10-10 11:54:44 +08:00 |
|
woody
|
0142f9a70f
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-10-10 09:54:07 +08:00 |
|
woody
|
b80a252404
|
fix(xfpz): 消费配置-所属专区展示问题修复
|
2025-10-10 09:53:53 +08:00 |
|
woody
|
5184833737
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-10-09 11:53:33 +08:00 |
|
woody
|
81fff13db5
|
feat(performanceTop): 业绩汇总字段调整
|
2025-10-09 11:53:21 +08:00 |
|
woody
|
3e6909ac0a
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-10-09 09:20:41 +08:00 |
|
woody
|
202db76e99
|
fix(bonusDetail): 奖金明细列表列宽度调整
|
2025-10-09 09:20:24 +08:00 |
|
woody
|
cda6543de5
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-30 10:59:35 +08:00 |
|
woody
|
5e841bef60
|
feat(member): 会员信息页面列表移除收益区域展示
|
2025-09-30 10:59:21 +08:00 |
|
woody
|
40e28a224f
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-30 10:15:15 +08:00 |
|
woody
|
bf6632b4e9
|
feat(dashboard): 会员数据精简展示
|
2025-09-30 10:15:04 +08:00 |
|
woody
|
a47e184e9f
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-30 09:51:23 +08:00 |
|
woody
|
354f4fa91c
|
feat(login): 移除登录页面用户名校验
|
2025-09-30 09:51:09 +08:00 |
|
woody
|
c614b21aef
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-29 14:35:26 +08:00 |
|
cabbage
|
ef0e08a9a0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-29 14:32:15 +08:00 |
|
cabbage
|
062b1b346c
|
## 奖金明细、奖金汇总添加新奖项字段；
|
2025-09-29 14:32:11 +08:00 |
|
woody
|
2f316b91e7
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-29 11:28:13 +08:00 |
|
woody
|
3f736a1e9e
|
feat(router): 隐藏区域考核
|
2025-09-29 11:27:44 +08:00 |
|
woody
|
0d5604acea
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-29 11:16:35 +08:00 |