3
0
Fork 0
java-store-retail-app/bd-business
cabbage 490346ee73 Merge remote-tracking branch 'origin/test' into online
# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.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/service/impl/SaOrderServiceImpl.java
#	bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
#	bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java
2025-08-22 09:31:32 +08:00
..
bd-business-bonus ## 商品、订单、结算支支持盒数为小数; 2025-08-22 09:30:33 +08:00
bd-business-common ## 提货中心相关流程; 2025-08-06 11:09:13 +08:00
bd-business-member Merge remote-tracking branch 'origin/test' into online 2025-08-22 09:31:32 +08:00
bd-business-report ## 商品、订单、结算支支持盒数为小数; 2025-08-22 09:30:33 +08:00
bd-business-sale ## 升级专区不能直接升级到董事代理,只能升级到区域代理; 2025-08-22 09:30:55 +08:00
bd-business-system ## Opt - 迁移总裁面板相关接口&迁移业绩汇总 2025-08-22 09:30:56 +08:00
pom.xml ## 去掉供应链涉及内容; 2025-07-07 17:33:16 +08:00