shopping-cart-application-service/src/main/java/cn/freemud/enums · 2db8e6a2c680a83ab9e9a01d7386d4d8c1d84c21 · jenkins / order-group

Merge branch 'feature/1.9.9-购物车接口增加渠道-海波' into develop · 74421aba
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
```
haibo.jiang committed Jan 08, 2020
74421aba

Name	Last commit	Last update
..
AccountType.java		Loading commit data...
ActiveFlagEnum.java		Loading commit data...
ActivityAuditStatus.java		Loading commit data...
ActivityChannelEnum.java		Loading commit data...
ActivityErrorCode.java		Loading commit data...
ActivityImplEnum.java		Loading commit data...
ActivityReqTypeEnum.java		Loading commit data...
ActivityResultCodeEnum.java		Loading commit data...
ActivityShareType.java		Loading commit data...
ActivityStatusEnum.java		Loading commit data...
ActivityTypeEnum.java		Loading commit data...
ActivityUserScopEnum.java		Loading commit data...
ApportionType.java		Loading commit data...
AuditStatus.java		Loading commit data...
BuriedPointEnum.java		Loading commit data...
BusinessTypeEnum.java		Loading commit data...
CheckNickNameType.java		Loading commit data...
CommonResponseResult.java		Loading commit data...
CouponFlag.java		Loading commit data...
CouponIsUsedEnum.java		Loading commit data...
CouponStateEnum.java		Loading commit data...
CouponStatus.java		Loading commit data...
CouponTypeEnum.java		Loading commit data...
CreateOrderType.java		Loading commit data...
DefaultPageType.java		Loading commit data...
DefaultShowType.java		Loading commit data...
DeliverStatus.java		Loading commit data...
ErrorImageType.java		Loading commit data...
ErrorTypeEnum.java		Loading commit data...
GoodsTypeEnum.java		Loading commit data...
GuessLikeStatus.java		Loading commit data...
ModuleType.java		Loading commit data...
OperationTypeEnum.java		Loading commit data...
OrderAccountType.java		Loading commit data...
OrderChannelType.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...
PayEbcodeType.java		Loading commit data...
PayStatus.java		Loading commit data...
PayType.java		Loading commit data...
PlatformType.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...
RefundStatus.java		Loading commit data...
ResponseResult.java		Loading commit data...
ScopeConfigType.java		Loading commit data...
SexType.java		Loading commit data...
ShareErrorCode.java		Loading commit data...
ShoppingCartChangeType.java		Loading commit data...
ShoppingCartPromotionEnum.java		Loading commit data...
StockChangeType.java		Loading commit data...
StoreItemStatus.java		Loading commit data...
TakeType.java		Loading commit data...
TransTypeEnum.java		Loading commit data...
VersionType.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...