Merge branch 'dev' of maopiao/mp-server into mp-server-test

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -290,6 +290,8 @@ public class CouponMgrController extends BaseApiController {
             }
         }
         Coupon coupon = mapperFacade.map(couponParam, Coupon.class);
+        String couponDetail = URLDecoder.decode(couponParam.getCouponDetail());
+        coupon.setCouponDetail(couponDetail);
         // 1、校验修改代金券是否为当前用户的代金券
         Coupon oldCoupon = couponService.getById(coupon.getCouponId());
         if (null == oldCoupon || null == oldCoupon.getCouponId()) {