-
1)默认 channel 和 stream key 2)移除 enabled 开关,通过 listener 是否存在来实现 3)调整包名,为接入 rocketmq 作为 mq 实现做准备
-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
-
Merge pull request !676 from 疯狂的世界/feature/mall_product
-
# Conflicts: # sql/mysql/mall.sql
-
2. 订单、会员注册记录来源终端
-
…o into feature/mall_product # Conflicts: # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
-
# Conflicts: # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
-
…into feature/mall_product # Conflicts: # yudao-server/src/main/resources/application-local.yaml