Merge remote-tracking branch 'origin/feature/20200108_xukang_麦咖啡p5v2' into…

Merge remote-tracking branch 'origin/feature/20200108_xukang_麦咖啡p5v2' into feature/20200108_xukang_麦咖啡p5v2

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -325,7 +325,7 @@ public class ShoppingCartGoodsDto {
     }
 
     @Data
-    public class MonthCardVo {
+    public static class MonthCardVo {
         /**
          * 卡号
          */