Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-service/src/main/java/com/hai/order/type/OrderProductType.java

@@ -26,6 +26,7 @@ public enum OrderProductType {
     PRODUCT_TYPE14(14, "比邻星停车业务" , "orderLogo/coupon.png", "BLX_PARK"),
     PRODUCT_TYPE15(15, "升级会员" , "orderLogo/coupon.png", "LEVEL_UP"),
     PRODUCT_TYPE16(16, "个人油卡充值" , "orderLogo/coupon.png", ""),
+    PRODUCT_TYPE17(17, "团购套餐" , "orderLogo/coupon.png", ""),
     PRODUCT_TYPE101(101, "惠支付" , "orderLogo/pay.png", "PAY"),
     PRODUCT_TYPE102(102, "门店活动" , "orderLogo/store_activity.png", "STORE_ACTIVITY"),
     ;