Commit Graph

399 Commits

Author SHA1 Message Date
woody 035cb27044 Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online 2025-10-09 16:43:21 +08:00
woody 9cdf561fb3 Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-10-09 11:32:52 +08:00
woody 7c826a0fce feat(memberRetailRegion): 收益区域配置可添加 2025-10-09 11:32:34 +08:00
woody 71aae23cab Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online 2025-09-28 09:16:12 +08:00
woody c6e3d4e828 Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-24 15:52:49 +08:00
woody e38e5b1c28 fix(config): 修复直推配置开关状态展示问题 2025-09-24 15:52:37 +08:00
woody 8c8ba399b7 Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-24 15:18:45 +08:00
woody ecb3b8e196 fix(directConfig): 直推排行配置开关状态展示问题修复 2025-09-24 15:18:31 +08:00
woody a7fd2ab2eb Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-24 15:16:43 +08:00
woody 0d1961c416 fix(directRecord): 直推升级数据添加导出权限 2025-09-24 15:16:29 +08:00
woody 3c474354f0 Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-24 13:24:03 +08:00
woody 7f32588951 feat(record): 直推升级数据页面开发 2025-09-24 13:23:47 +08:00
woody a77aad953b Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-24 10:59:03 +08:00
woody dec9a08d77 feat(router): 菜单顺序调整 2025-09-24 10:58:51 +08:00
woody ac48a7e158 fix(addDirect): 活动及展示时间补时分秒 2025-09-24 10:54:40 +08:00
woody 3f62cfad14 feat(directPush): 直推数据排行功能开发 2025-09-24 10:35:23 +08:00
woody 6946a7700c Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-23 17:33:06 +08:00
woody 32d363494f fix(addDirect): date picker type 2025-09-23 17:32:54 +08:00
woody 03b681d255 Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-23 17:27:23 +08:00
woody 79bb378a7f fix(addDirect): date-picker use daterange 2025-09-23 17:27:11 +08:00
woody 69e6ea1c9d Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-23 16:57:50 +08:00
woody b1ec67cfac feat(directPush): 直推升级更换接口 2025-09-23 16:57:32 +08:00
woody 54ff8907c3 Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online 2025-09-22 09:12:41 +08:00
woody 5f4a1159ca Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-18 14:11:05 +08:00
woody bcdfda3d63 feat(lotteryDetails): 抽奖明细去签呈 2025-09-18 14:10:49 +08:00
woody 3140f01bb0 Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-17 17:53:12 +08:00
woody 413b570b02 feat(marketing): 营销管理-抽奖配置、直推赠送、旅游活动移除签呈 2025-09-17 17:52:03 +08:00
sangelxiu1 3e04f44ce0 ## Opt - 在线支付明细增加体系名称&体系查询条件 2025-09-16 14:12:25 +08:00
woody 79ff2f4b3c Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test 2025-09-16 13:40:47 +08:00
woody 99dea73ed3 Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-dev 2025-09-16 13:40:09 +08:00
woody 6220c821eb feat(giftGoods): 商品赠送、消费赠送、会员消费赠送去签呈 2025-09-16 13:40:06 +08:00
sangelxiu1 0244bfa04f ## Opt - 在线支付明细增加体系名称&体系查询条件 2025-09-16 12:11:12 +08:00
sangelxiu1 2f1473aac9 ## Opt - 在线支付明细增加体系名称&体系查询条件 2025-09-16 12:10:55 +08:00
woody 5bf8ae83e9 Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online 2025-09-16 10:01:04 +08:00
zhangheng 82dc73366c ## 删除死点优化返回信息 2025-09-12 09:09:47 +08:00
zhangheng f0b7ed589f ## 删除死点优化返回信息 2025-09-11 13:54:19 +08:00
zhangheng c853b24207 ## 删除死点 2025-09-11 13:35:38 +08:00
zhangheng ef183d7344 ## 删除死点 2025-09-11 13:34:24 +08:00
zhangheng df46562d6e ## 删除死点 2025-09-11 11:35:48 +08:00
zhangheng 9ffcda3dfe ## 删除死点 2025-09-11 10:46:29 +08:00
woody 44c905672d fix(CashDetails): 移除汇率列 2025-09-04 14:45:01 +08:00
woody 68f3f8405a Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-online 2025-08-28 09:30:10 +08:00
woody 5d2e58bef0 fix(framework): 安置架构最多查7层 2025-08-27 16:05:24 +08:00
woody 05f7745943 Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online 2025-08-27 09:44:39 +08:00
woody 5bde29fd2c fix(goods): 上下架时间以及预计发货时间可清空 2025-08-25 16:09:55 +08:00
woody 4f23286b6e fix(productSaleStatistics): 产品销售统计-起始结束日期未初始化问题处理 2025-08-22 09:18:23 +08:00
woody 5606268c9a Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online 2025-08-21 09:19:52 +08:00
woody 9f9c2167d6 feat(cashDetails): 添加刷新支付状态按钮 2025-08-20 11:40:18 +08:00
woody e2bd45c29d fix(cashDetail): 错行问题修复 2025-08-20 10:16:34 +08:00
woody c48e4d477a fix(CashDetail): 修复合计行展示不正确的问题 2025-08-20 10:09:34 +08:00