Commit Graph

139 Commits

Author SHA1 Message Date
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
woody 5c8e696557 Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test 2025-06-30 10:32:40 +08:00
cabbage ed161f53f3 ## 奖金来源、奖金汇总添加培育津贴; 2025-06-27 11:41:18 +08:00
woody a02a70787f feat(systemConfiguration): 体系配置字段调整 2025-06-26 14:38:15 +08:00
woody 2d0e470a73 feat(configuration): 添加区域分组页面 2025-06-25 20:03:35 +08:00
woody 7c70a23ae0 Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test 2025-06-25 15:11:55 +08:00
woody b8229da887 feat(bonus): 奖金汇总移除小计 2025-06-25 15:11:34 +08:00
woody 1916c8e10e feat(bonus): 奖金汇总字段调整 2025-06-25 15:03:25 +08:00
woody bfd05019c5 Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test 2025-06-24 09:50:00 +08:00
woody 8b6ce2f8ce feat(sourceBonus): 奖金来源删除无用字段 2025-06-23 17:49:36 +08:00
woody f7575cedcb feat(bonusDetail): 奖金明细字段调整 2025-06-23 17:22:52 +08:00
woody 091ca081ed feat(bonusDetail): 奖金明细列表字段调整 2025-06-23 17:06:32 +08:00
woody 489812cbc6 Merge branches 'base-online' and 'test' of 47.94.45.65:angelo/web-retail-admin into base-online 2025-06-23 16:21:00 +08:00
woody ad581fc9aa Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test 2025-06-23 16:20:45 +08:00
woody 85782978d8 feat(nowDelivery): 发货清单移除追溯字段 2025-06-23 16:20:26 +08:00
woody bb76157638 Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online 2025-06-23 13:43:34 +08:00
woody 26ed9693e9 fix(emptyOrder): 空单注册批量操作默认值问题处理 2025-06-23 11:54:03 +08:00
woody 623d749694 fix(emptyOrder): 空单注册是否激活默认为否 2025-06-23 11:04:36 +08:00
woody a23a945213 fix(emptyOrder): 空单注册是否激活默认为否 2025-06-23 09:26:23 +08:00
woody 115a0c17bd fix(member): 结算等级修改 2025-06-21 09:47:35 +08:00
woody 759e4b9dd8 fix(member): 结算等级修改 2025-06-21 09:43:00 +08:00
cabbage 8f9732b6be ## 会员信息添加分红奖衔; 2025-06-19 16:06:45 +08:00