-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
-
Merge pull request !685 from puhui999/feature/mall_product
-
Merge pull request !683 from zxiaoxiu/discount
-
Merge pull request !676 from 疯狂的世界/feature/mall_product
-
…-pro into feature/mall_product
-
# Conflicts: # sql/mysql/mall.sql
-
# Conflicts: # sql/mysql/statistics.sql
