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

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -169,7 +169,7 @@ public class ProductController extends BaseController {
     /**
      * 优惠券说明页
      */
-    @GetMapping("/activity/couponExp.html")
+    @GetMapping("/product/couponExp.html")
     public String getCouponExpPath(){
         return ACTIVITY_COUPON_EXP;
     }