cabbage e4e58f0253 Merge remote-tracking branch 'origin/dev' into test ... # Conflicts: # bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java # bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java # bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java # bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml		2025-09-26 18:03:36 +08:00
..
bd-business-bonus	## 日结处理业绩；	2025-09-26 17:55:40 +08:00
bd-business-common	## 替换国际化处理；	2025-06-18 16:46:04 +08:00
bd-business-member	## 导出请求修改	2025-09-26 17:49:09 +08:00
bd-business-report	## 一二三阶段填充点位数据；一二阶段奖金计算；	2025-09-24 18:00:36 +08:00
bd-business-sale	## 赠点激活阶段填充处理；	2025-09-26 14:56:13 +08:00
bd-business-system	## 精品专区直推收益；商城专区见点收益；商品基础规格等配置去掉缓存；去掉部分不需要代码和枚举；	2025-09-18 14:19:08 +08:00
pom.xml	## 去掉进销存相关内容；	2025-07-09 11:16:15 +08:00