Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of…

Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/OpenPlatformPartnerWxappConfig.java

-package cn.freemud.entities.dto;
-
-import lombok.Data;
-
-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @version V1.0
- * @Title: OpenPlatformPartnerWxappConfig
- * @Package cn.freemud.entities.dto
- * @Description:
- * @author: ping1.wu
- * @date: 2020/9/15 15:59
- * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-@Data
-public class OpenPlatformPartnerWxappConfig {
-
-    private String wxAppid;
-
-    private String appKey;
-    private String appValue;
-
-    private Integer state;
-}