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 |
|
woody
|
1e23a59fba
|
feat(global): 真实奖衔 当月奖衔改为荣誉奖衔
|
2025-09-29 11:15:26 +08:00 |
|
woody
|
fe55fec231
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-29 09:24:47 +08:00 |
|
woody
|
65a878666e
|
feat(bonus): 移除配置管理-奖金配置内无用功能
|
2025-09-29 09:24:29 +08:00 |
|
woody
|
dd0d705645
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-28 17:54:17 +08:00 |
|
woody
|
0668edaa7c
|
fix(jxpz): 奖衔配置字段调整
|
2025-09-28 17:53:51 +08:00 |
|
woody
|
2a35f51398
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-28 17:25:54 +08:00 |
|
woody
|
88f78ff935
|
feat(arch): 阶段架构展示字段调整
|
2025-09-28 17:25:41 +08:00 |
|
woody
|
f40260f8cd
|
feat(global): 全局删除等级
|
2025-09-28 15:35:02 +08:00 |
|
woody
|
71c8a382f1
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-28 09:12:36 +08:00 |
|
woody
|
b29d78bd16
|
fix(memberPointInfo): 修复全局样式问题
|
2025-09-28 09:12:23 +08:00 |
|
woody
|
4feee6e2e8
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-26 17:25:01 +08:00 |
|
woody
|
f326d950a2
|
feat(memberPoint): 列表添加排序
|
2025-09-26 17:24:49 +08:00 |
|
woody
|
237fe18db8
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-26 15:15:12 +08:00 |
|
woody
|
c4ea76d4ba
|
fix(router): add router title
|
2025-09-26 15:14:55 +08:00 |
|
woody
|
5712e9b0a9
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-26 14:04:56 +08:00 |
|
woody
|
1ad050cf7d
|
feat(memberPointInfo): 添加待激活点位总数列
|
2025-09-26 14:04:45 +08:00 |
|
woody
|
4468c47a1d
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-26 14:02:51 +08:00 |
|
woody
|
8a6384a2a7
|
feat(memberPointInfo): 会员点位信息功能开发
|
2025-09-26 14:02:40 +08:00 |
|
woody
|
6fe69ee12e
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-26 10:43:28 +08:00 |
|
woody
|
1ab58e6189
|
feat(arch): 推荐架构方案二
|
2025-09-26 10:43:16 +08:00 |
|
woody
|
29aca47694
|
fix(framework): 推荐架构 方案一移除memberCode默认值
|
2025-09-25 15:01:57 +08:00 |
 sangelxiu1
|
3a5d7f1ecd
|
## Opt - 奖金汇总
|
2025-09-25 10:50:52 +08:00 |
|
sangelxiu1
|
ddcdee3a51
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-25 10:32:21 +08:00 |
|
sangelxiu1
|
b47caf16a0
|
## Opt - 奖金明细
|
2025-09-25 10:32:12 +08:00 |
|
woody
|
3bd44b7a81
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-23 10:52:08 +08:00 |
|
woody
|
f479b22418
|
feat(az-framework): 阶段架构接口联调
|
2025-09-23 10:51:28 +08:00 |
|
woody
|
b8dcf545b0
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-18 16:55:30 +08:00 |
|
woody
|
4f51da9062
|
fix(member): 移除404接口
|
2025-09-18 16:55:16 +08:00 |
|
woody
|
410ab9131e
|
Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test
|
2025-09-18 14:48:47 +08:00 |
|
woody
|
506a56e298
|
feat(onlinePayDetails): 手动刷新支付状态代码迁移
|
2025-09-18 14:47:08 +08:00 |
|
woody
|
abf485d5f9
|
chore(env): update env
|
2025-09-17 18:07:19 +08:00 |
|
woody
|
9211c37556
|
feat(azjg): 安置架构代码更新
|
2025-08-19 11:46:15 +08:00 |
|
woody
|
c82e31f099
|
chore(env): 更新线上快速登录地址
|
2025-08-18 12:00:47 +08:00 |
|
woody
|
b33a6621b5
|
chore(env): 更新快速登录地址
|
2025-08-18 11:59:25 +08:00 |
|
woody
|
e74b9a1801
|
feat(router): 添加全网管理路由配置
|
2025-08-14 17:52:34 +08:00 |
|
woody
|
a1474c9891
|
feat(orderSync): 已处理不展示操作按钮
|
2025-08-14 15:39:51 +08:00 |
|
woody
|
fe0cd17272
|
feat(orderSync): 同步失败订单代码迁移
|
2025-08-14 09:25:11 +08:00 |
|
woody
|
d4067000ca
|
feat(cashDetails): 个税改为服务费
|
2025-08-12 16:52:54 +08:00 |