Merge branch 'master' into branch

# Conflicts:
#	src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -239,6 +239,7 @@ public class MarketServiceImpl implements MarketService {
                         .eq(CouponCustomerRelevance::getOrderId, orderId)
                         .eq(CouponCustomerRelevance::getState, 1)
                         .eq(CouponCustomerRelevance::getSourceType, 0));
+
         innerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevance -> couponCustomerRelevance.setState(CouponCustomerRelevance.STATE_USED));
         if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) {
             couponCustomerRelevanceService.saveOrUpdateBatch(innerCouponCustomerRelevanceServiceList);