52e735f360
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java |
||
---|---|---|
.. | ||
yudao-module-member-api | ||
yudao-module-member-biz | ||
pom.xml |
52e735f360
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java |
||
---|---|---|
.. | ||
yudao-module-member-api | ||
yudao-module-member-biz | ||
pom.xml |