cabbage 05f57a36ca Merge remote-tracking branch 'origin/dev' into test ... # Conflicts: # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailRangeServiceImpl.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/dto/BonusStageData.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusStageMapper.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java # bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java # bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml # bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml # bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml # bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java # bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java # bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java # bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java # bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml		2025-09-24 18:04:19 +08:00
..
bd-business-bonus	Merge remote-tracking branch 'origin/dev' into test	2025-09-24 18:04:19 +08:00
bd-business-common	## 替换国际化处理；	2025-06-18 16:46:04 +08:00
bd-business-member	## 三阶段架构前台报错信息修改	2025-09-24 14:42:36 +08:00
bd-business-report	## 一二三阶段填充点位数据；一二阶段奖金计算；	2025-09-24 18:00:36 +08:00
bd-business-sale	## Opt - 后台撤单 (商城-43) 处理	2025-09-23 11:35:50 +08:00
bd-business-system	## 精品专区直推收益；商城专区见点收益；商品基础规格等配置去掉缓存；去掉部分不需要代码和枚举；	2025-09-18 14:19:08 +08:00
pom.xml	## 去掉进销存相关内容；	2025-07-09 11:16:15 +08:00