-
…o into feature/mall_product # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
-
# Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
-
…into feature/mall_product # Conflicts: # yudao-server/src/main/resources/application-local.yaml
-
Merge pull request !649 from 疯狂的世界/feature/mall_product
-
…o into feature/mall_product # Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
-
Merge pull request !643 from puhui999/feature/mall_product
-
Merge pull request !646 from lanxindx/feature/mall_product