woody
|
24ca54c3ef
|
Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online
|
2025-07-11 09:39:03 +08:00 |
|
woody
|
d0d96f65c7
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-10 13:41:29 +08:00 |
|
woody
|
4f113e8178
|
feat(vertexAwardConfig): 添加体系奖项配置列表
|
2025-07-10 13:41:14 +08:00 |
|
woody
|
7c0757fee3
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-10 09:58:31 +08:00 |
|
woody
|
d7ede8ce75
|
feat(CashDetail): add reject btn role
|
2025-07-10 09:56:23 +08:00 |
|
woody
|
fa80e61020
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-09 15:14:34 +08:00 |
|
woody
|
4b6c06c1cb
|
feat(bonus): 奖金字段调整，复购级差收益改为月复购级差收益
|
2025-07-09 15:13:22 +08:00 |
|
woody
|
12fade3092
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-09 11:21:46 +08:00 |
|
woody
|
cfba91182e
|
feat(CashDetail): 提现明细添加驳回操作
|
2025-07-09 11:21:31 +08:00 |
|
woody
|
22440e6963
|
Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online
|
2025-07-09 10:32:24 +08:00 |
|
woody
|
a46814e6c8
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-09 10:24:34 +08:00 |
|
woody
|
b1aef14cab
|
feat(goods): 商品配置 复购专区默认比率 且当分红方式为比率时，区域分红不可编辑
|
2025-07-09 10:24:20 +08:00 |
|
woody
|
702f96615f
|
Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online
|
2025-07-09 09:09:49 +08:00 |
|
woody
|
2f225fbeac
|
feat(paySet): 支付设置添加字段
|
2025-07-08 17:20:02 +08:00 |
|
woody
|
20e030153c
|
feat(goodsRelease): 自定义标签提示
|
2025-07-05 11:00:11 +08:00 |
|
woody
|
7d0692c803
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-03 09:10:58 +08:00 |
|
woody
|
73a53f63a1
|
feat(goodsManage): 商品配置添加区域分红方式字段
|
2025-07-02 16:52:32 +08:00 |
|
woody
|
edfcac2fa4
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-02 10:45:36 +08:00 |
|
woody
|
3d6942a315
|
feat(systemconfiguration): 补全体系管理按钮权限展示逻辑
|
2025-07-02 10:45:22 +08:00 |
|
woody
|
f6208ee765
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-02 10:23:16 +08:00 |
|
woody
|
ad773e2c02
|
feat(groupConfiguration): topBar更换
|
2025-07-02 10:23:02 +08:00 |
|
woody
|
596a4eaca6
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-02 09:28:39 +08:00 |
|
woody
|
0d468e4b61
|
feat(groupConfiguration): add btn role
|
2025-07-02 09:28:27 +08:00 |
|
woody
|
b04692631c
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-01 15:01:40 +08:00 |
|
woody
|
0289a18800
|
feat(router): 路由配置调整
|
2025-07-01 15:01:28 +08:00 |
|
woody
|
08838f81a3
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-01 09:54:49 +08:00 |
|
woody
|
84cdf3f4d5
|
Merge branch 'feat/goodsEdit-boxNum' of 47.94.45.65:angelo/web-retail-admin into dev
|
2025-07-01 09:54:34 +08:00 |
|
woody
|
b9d5a6a7e3
|
feat(jxpz): 奖衔配置列宽度调整
|
2025-07-01 09:34:42 +08:00 |
|
woody
|
a2ec641a18
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-07-01 09:34:16 +08:00 |
|
woody
|
86fc6a8855
|
feat(jxpz): 奖衔配置列宽度调整
|
2025-07-01 09:34:04 +08:00 |
|
woody
|
8bc8048299
|
feat(jxpz): 奖衔配置添加shareCommuntiyCheck分红小部门业绩
|
2025-07-01 09:08:47 +08:00 |
|
woody
|
f2d40341fa
|
feat(jxpz): 奖衔配置字段调整
|
2025-07-01 09:08:20 +08:00 |
|
woody
|
3fb2ec45d0
|
feat(fdfh): 辅导分红文案改为培育津贴
|
2025-07-01 09:08:08 +08:00 |
|
woody
|
2efc0c210d
|
fix(router): 暂时注释业绩汇总路由配置 bug-213
|
2025-07-01 09:07:21 +08:00 |
 cabbage
|
6391c9b212
|
## 奖金来源、奖金汇总添加培育津贴；
|
2025-07-01 09:07:12 +08:00 |
|
woody
|
a20b74037b
|
feat(bonus): 奖金汇总移除小计
|
2025-07-01 09:06:49 +08:00 |
|
woody
|
369d9ffcd6
|
feat(bonus): 奖金汇总字段调整
|
2025-07-01 09:06:38 +08:00 |
|
woody
|
d4fa27f4bc
|
feat(sourceBonus): 奖金来源删除无用字段
|
2025-07-01 09:06:29 +08:00 |
|
woody
|
126232fa02
|
feat(bonusDetail): 奖金明细字段调整
|
2025-07-01 09:06:22 +08:00 |
|
woody
|
5c3517400a
|
feat(bonusDetail): 奖金明细列表字段调整
|
2025-07-01 09:06:11 +08:00 |
|
woody
|
e17e54411b
|
feat(waterInjection): 等级修改-团队盒数与小区盒数小数精度为两位小数
|
2025-06-30 16:36:48 +08:00 |
|
woody
|
b64002c21e
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-06-30 14:45:34 +08:00 |
|
woody
|
45be629525
|
feat(jcsz): 商品配置基础设置添加上传盒数字段
|
2025-06-30 14:43:59 +08:00 |
|
woody
|
3161beb2f9
|
feat(systemConfiguration): 添加所属区域分组筛选条件
|
2025-06-30 14:12:56 +08:00 |
|
woody
|
e118af8685
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-06-30 13:42:35 +08:00 |
|
woody
|
0d95d12a2d
|
feat(jxpz): 奖衔配置添加shareCommuntiyCheck分红小部门业绩
|
2025-06-30 13:42:13 +08:00 |
|
woody
|
c7fdea0e9e
|
feat(jxpz): 奖衔配置字段调整
|
2025-06-30 13:26:32 +08:00 |
|
woody
|
f163ffc9f0
|
feat(fdfh): 辅导分红文案改为培育津贴
|
2025-06-30 11:51:14 +08:00 |
|
woody
|
31e159bc63
|
Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test
|
2025-06-30 10:46:01 +08:00 |
|
woody
|
c2cd89945e
|
fix(router): 暂时注释业绩汇总路由配置 bug-213
|
2025-06-30 10:45:44 +08:00 |