Merge branch 'feature/20210111_P5V2菜单购买月享卡_yu.sun'

# Conflicts:
#	assortment-shoppingcart-sdk/readme.md

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>2.0.20-SNAPSHOT</version>
+    <version>1.2.1.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-shoppingcart-sdk/readme.md

@@ -11,4 +11,4 @@
 | 1.1.8.RELEASE| 拼单| 缪晖 | 2020-12-10 |
 | 1.1.9.RELEASE| 清除代金券缓存| 缪晖 | 2020-12-17 |
 | 1.2.0.RELEASE| 清除代金券缓存| 李小二 | 2021-01-19 |
-| 2.0.20-SNAPSHOT| 更新cartGoods字段 | 孙昱 | 2021-01-15 |
+| 1.2.1.RELEASE| 麦咖啡菜单购月享卡更新字段| 孙昱 | 2021-01-26 |

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>2.0.21-SNAPSHOT</version>
+            <version>1.2.1.RELEASE</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>