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

无关风月

7 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -667,6 +667,9 @@
                    stringObjectHashMap.put("experienceName", dataVo.getExperience());
                    coupon.setContent(gson.toJson(stringObjectHashMap));
                    break;
                    case 4:
                        coupon.setGoodsId(dataVo.getGoodsId());
                        break;
                default:
                    break;
            }