zys
извршује push на test у tuhuyangche/tuhuyangche
a82ffeea78 Merge branch 'dev-zys' into test
# Conflicts:
# tuhuyangche/pom.xml
# tuhuyangche/src/main/java/com/zhentao/TuhuCarMaintenanceApplication.java
# tuhuyangche/src/main/java/com/zhentao/common/enums/CouponType.java
# tuhuyangche/src/main/java/com/zhentao/controller/CouponController.java
# tuhuyangche/src/main/java/com/zhentao/modules/domain/Coupon.java
# tuhuyangche/src/main/java/com/zhentao/modules/service/CouponService.java
# tuhuyangche/src/main/java/com/zhentao/modules/service/PointsRuleService.java
# tuhuyangche/src/main/java/com/zhentao/modules/service/UserCouponService.java
# tuhuyangche/src/main/java/com/zhentao/modules/service/impl/CouponServiceImpl.java
# tuhuyangche/src/main/java/com/zhentao/modules/service/impl/UserCouponServiceImpl.java
# tuhuyangche/src/main/resources/application.yml
c4c8a50bf9 订单模块
- Поређење ових 2 комита »
пре 2 месеци