Commit Graph

197 Commits

Author SHA1 Message Date
cabbage bb188366ba ## 日拨比统计方法补全; 2025-04-26 15:35:20 +08:00
cabbage 3b61b2af85 ## 三单循环列表改为倒序查询; 2025-04-26 15:35:17 +08:00
cabbage 1b059fc96b ## 修改专区名称; 2025-04-26 15:35:13 +08:00
cabbage 0f400f7e4a Merge remote-tracking branch 'origin/base_test' into base_online
# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
2025-04-24 19:27:46 +08:00
cabbage 2478baae77 Merge remote-tracking branch 'origin/base_dev' into base_test 2025-04-24 19:04:16 +08:00
cabbage 7ed9a9085c ## 目录以及依赖调整包名; 2025-04-24 19:02:42 +08:00
cabbage a980218df3 ## 目录以及依赖调整包名; 2025-04-24 19:02:39 +08:00
cabbage 1ed8f4fea4 ## 目录以及依赖调整包名; 2025-04-24 19:02:08 +08:00
cabbage 1416d9ae7e ## 目录以及依赖调整包名; 2025-04-24 18:32:38 +08:00
cabbage e7e896e251 ## 金额、业绩显示2位小数; 2025-04-24 15:44:07 +08:00
cabbage f270f8cc36 ## 金额、业绩显示2位小数; 2025-04-24 15:44:06 +08:00
cabbage 9e02399de7 ## 金额、业绩显示2位小数; 2025-04-24 15:43:39 +08:00
cabbage 8a5bce6b9d ## 金额、业绩显示2位小数; 2025-04-24 15:43:12 +08:00
cabbage 73f2c96722 ## 进入报表报错问题; 2025-04-24 15:30:30 +08:00
cabbage 69c30e93d2 ## 安置架构业绩显示2位小数; 2025-04-24 15:30:30 +08:00
cabbage 68ff95394b ## 登录用户缓存过期改为1个小时,刷新校验改为20分钟; 2025-04-24 15:30:29 +08:00
cabbage 2740929883 ## 登录用户缓存过期改为1个小时,刷新校验改为20分钟; 2025-04-24 15:30:29 +08:00
cabbage 34e57f4b71 ## 缓存存放token改为1个小时; 2025-04-24 15:30:29 +08:00
cabbage 1f543d06c7 ## 进入报表报错问题; 2025-04-24 15:27:11 +08:00
cabbage c77f9a90ad ## 安置架构业绩显示2位小数; 2025-04-24 15:01:51 +08:00
cabbage 52815239e4 ## 登录用户缓存过期改为1个小时,刷新校验改为20分钟; 2025-04-24 11:01:28 +08:00
cabbage 1fce4dbf01 ## 登录用户缓存过期改为1个小时,刷新校验改为20分钟; 2025-04-24 10:48:22 +08:00
cabbage fae19d3361 ## 缓存存放token改为1个小时; 2025-04-24 09:52:24 +08:00
woody 85de98bced feat(BdAreaCurrency): 消费配置列表-扣款顺序比例列,数字改为展示两位小数 2025-04-24 09:48:15 +08:00
cabbage 79b78c9cd1 ## 删除历史结算表单独处理,如果异常不影响主流程;修改打印日志; 2025-04-24 09:48:14 +08:00
cabbage 9ae3ed62a8 ## V3、V4可以进行购买升级; 2025-04-24 09:48:14 +08:00
cabbage 07d5ea8d12 ## 乐学2025.09.01之前,领导奖不需要考核月新増业绩; 2025-04-24 09:48:13 +08:00
woody f4d0293731 fix(BdNoticeMapper): 公告弹窗查询逻辑修改 2025-04-24 09:48:13 +08:00
woody db7753566a feat(BdAreaCurrency): 消费配置列表-扣款顺序比例列,数字改为展示两位小数 2025-04-24 09:46:33 +08:00
cabbage 551a8fd684 ## 删除历史结算表单独处理,如果异常不影响主流程;修改打印日志; 2025-04-24 09:46:31 +08:00
cabbage 06f7def037 Merge remote-tracking branch 'origin/base_dev' into base_dev 2025-04-24 09:45:43 +08:00
cabbage d2d0283486 ## 删除历史结算表单独处理,如果异常不影响主流程;修改打印日志; 2025-04-24 09:45:34 +08:00
woody a5fd926fc7 feat(BdAreaCurrency): 消费配置列表-扣款顺序比例列,数字改为展示两位小数 2025-04-24 09:45:30 +08:00
cabbage 1d37e84036 ## V3、V4可以进行购买升级; 2025-04-23 18:28:12 +08:00
cabbage 7dbfb05585 ## V3、V4可以进行购买升级; 2025-04-23 17:54:20 +08:00
cabbage f53fd35268 ## 乐学2025.09.01之前,领导奖不需要考核月新増业绩; 2025-04-23 15:04:54 +08:00
woody ec5cd922da fix(BdNoticeMapper): 公告弹窗查询逻辑修改 2025-04-23 15:04:52 +08:00
cabbage 42d1d78297 ## 乐学2025.09.01之前,领导奖不需要考核月新増业绩; 2025-04-23 15:04:16 +08:00
woody 38fd54f308 fix(BdNoticeMapper): 公告弹窗查询逻辑修改 2025-04-23 10:25:41 +08:00
cabbage f246e78e45 ## 延缓收益发放添加会员收益状态判断; 2025-04-23 10:06:04 +08:00
cabbage 146e5897d5 ## 延缓收益发放添加会员收益状态判断; 2025-04-23 10:06:04 +08:00
cabbage 09e38e81fe ## 查询延缓发放关联查询会员状态; 2025-04-23 10:06:04 +08:00
cabbage 86c8a74816 ## 延缓收益发放添加会员收益状态判断; 2025-04-23 10:04:36 +08:00
cabbage c906010ebf ## 延缓收益发放添加会员收益状态判断; 2025-04-23 09:56:50 +08:00
cabbage 68dd3cca99 ## 查询延缓发放关联查询会员状态; 2025-04-23 09:12:32 +08:00
cabbage 576e3a18ac ## 部分配置提取到nacos;定时任务修改生产配置; 2025-04-22 19:31:33 +08:00
cabbage e850672eb9 ## 部分配置提取到nacos;定时任务修改生产配置; 2025-04-22 19:30:02 +08:00
cabbage f0f9092bde ## 乐学注册专区控制显示; 2025-04-22 16:10:24 +08:00
cabbage 1d54b461cc ## 订单类型、商品专区乐学相关名称修改; 2025-04-22 16:10:22 +08:00
cabbage c106f48cad ## 新会员显示业绩报错处理; 2025-04-22 16:10:21 +08:00