order-application-service/src/main/java/cn/freemud/enums · 9a7161acae60903210a131f73629e10237c8c569 · jenkins / order-group

Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 7d226603
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
姜海波 committed Mar 26, 2020
7d226603

Name	Last commit	Last update
..
ActivityChannelEnum.java		Loading commit data...
ActivityImplEnum.java		Loading commit data...
ActivityShareType.java		Loading commit data...
ActivityTypeEnum.java		Loading commit data...
AfterSalesOrderCreateEventEnum.java		Loading commit data...
ApportionType.java		Loading commit data...
BuriedPointEnum.java		Loading commit data...
BusinessTypeEnum.java		Loading commit data...
CommonResponseResult.java		Loading commit data...
CouponFlag.java		Loading commit data...
CouponStatus.java		Loading commit data...
CouponTypeEnum.java		Loading commit data...
CreateOrderType.java		Loading commit data...
DeliverStatus.java		Loading commit data...
DeliveryChannelEnum.java		Loading commit data...
DeliveryStatus.java		Loading commit data...
EvaluationStatus.java		Loading commit data...
GoodsTypeEnum.java		Loading commit data...
GuessLikeStatus.java		Loading commit data...
OrderAccountType.java		Loading commit data...
OrderBeanType.java		Loading commit data...
OrderChannelType.java		Loading commit data...
OrderRefundEnum.java		Loading commit data...
OrderSourceType.java		Loading commit data...
OrderStatus.java		Loading commit data...
OrderType.java		Loading commit data...
OrderViewStatus.java		Loading commit data...
PayEbCodeWXEnum.java		Loading commit data...
PayEbCodeYFEnum.java		Loading commit data...
PayRefundStatus.java		Loading commit data...
PayStatus.java		Loading commit data...
PayType.java		Loading commit data...
PluginAuditStatusEnum.java		Loading commit data...
ProductInfoType.java		Loading commit data...
ProductType.java		Loading commit data...
PromotionActivityStatus.java		Loading commit data...
PromotionActivityType.java		Loading commit data...
QueryOrderStatus.java		Loading commit data...
ReceiveAddressLabelType.java		Loading commit data...
RedisCacheEnum.java		Loading commit data...
RefundReasonEnum.java		Loading commit data...
RefundStatus.java		Loading commit data...
ResponseResult.java		Loading commit data...
ScopeConfigType.java		Loading commit data...
SexType.java		Loading commit data...
ShoppingCartChangeType.java		Loading commit data...
StoreItemStatus.java		Loading commit data...
TakeType.java		Loading commit data...
TradeState.java		Loading commit data...
TransTypeEnum.java		Loading commit data...
WechatSyncStatus.java		Loading commit data...
WechatUnitType.java		Loading commit data...
WxappMessageTemplateType.java		Loading commit data...
WxappStatus.java		Loading commit data...
YesOrNoEnum.java		Loading commit data...