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

无关风月

7 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Coupon.java

@@ -133,6 +133,10 @@
     */
    private Integer cityManagerId;
    /**
     * 积分商品id
     */
    private Integer goodsId;
    /**
     * 数量
     */
    private Integer count;