Merge branch 'master' of http://git.dev.2b3.cn/tencent/services into test

UPGRADE.md

+# 1.0.76
+- 购物车枚举
+
+# 1.0.75
+- 添加rpc接口-批量查询指定店铺下买家佣金钱包
+
+# 1.0.74
+- 拼团列表枚举
+
 # 1.0.72
 - User实体增加判断是否是托管小程序授权的方法
 

src/Goods/Enum/ShoppingCartEnum.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: work
+ * Date: 2019-03-08
+ * Time: 11:08
+ */
+
+namespace Hdll\Services\Goods\Enum;
+
+class ShoppingCartEnum
+{
+	const NO_SETTLEMENT = 0;
+	const HAS_BEEN_SETTLED = 1;
+}
\ No newline at end of file

src/GroupBooking/Enum/GroupBookingEnum.php

@@ -14,6 +14,7 @@ class GroupBookingEnum
 	const ACTIVITY_NOT_START = 1;//未开始
 	const ACTIVITY_ON = 2;//已开始
 	const ACTIVITY_OFF = 3;//已结束
+	const ACTIVITY_NOT_OFF = 4;//已开始和未开始
 
 	const ONLINE = 1;//上线
 	const DOWNLINE = 2;//下线