cabbage 4eb3c13324 Merge remote-tracking branch 'origin/test' into online ... # Conflicts: # bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.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/vo/MemberBonusFirstPurchaseVO.java # bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java # bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java # bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java # bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java # bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java # bd-business/bd-business-member/src/main/java/com/hzs/member/census/vo/CensusSummaryVo.java # bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java # bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java # bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java # bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java # bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailRegionService.java # bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java # bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java # bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml # bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml # bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml # bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java # bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderChargeLogController.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java # bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java # bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml # bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ITradeConfigServiceProvider.java # bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdTradeWhiteConfigService.java # bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdTradeConfigServiceImpl.java # bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdTradeWhiteConfigServiceImpl.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/config/BdConfig.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECurrencyType.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESysName.java # bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java # bd-third/src/main/java/com/hzs/third/job/MemberJob.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-10-09 15:05:17 +08:00
..
bd-business-bonus	## 奖衔升级处理方式优化；	2025-09-30 13:27:49 +08:00
bd-business-common	## 替换国际化处理；	2025-06-18 16:46:04 +08:00
bd-business-member	Merge remote-tracking branch 'origin/test' into online	2025-10-09 15:05:17 +08:00
bd-business-report	## Opt - 业绩统计细化	2025-09-29 11:08:40 +08:00
bd-business-sale	## 订单开票枚举替换	2025-09-30 10:55:38 +08:00
bd-business-system	## 奖衔计算方式改为先算奖衔；赠点排点方式问题修复；	2025-09-29 18:02:25 +08:00
pom.xml	## 去掉进销存相关内容；	2025-07-09 11:16:15 +08:00