Chopper fdb55bc426 Merge branch 'backup' ...

# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java

2021-07-22 12:07:22 +08:00

..

src/main

Merge branch 'backup'

2021-07-22 12:07:22 +08:00

pom.xml

maven规范补充

2021-07-13 10:39:27 +08:00