Merge branch 'developerA' of D:\WorkSpace\Web\caimei\caimei-caimei365-www with conflicts.

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

@@ -24,7 +24,7 @@ public class ProductController extends BaseController {
 	private static final String PROMOTIONS_LIST_PATH = "product/promotions";
     private static final String INSTRUMENT_PAGE_PATH = "product/instrument";
     private static final String INSTRUMENT_LIST_PATH = "product/instruelist";
-    private static final String PRODUCT_QUALITY_AUTHORIZE = "product/qualityauthorize";
+    private static final String QUALITY_AUTHORRIZE_PATH = "product/qualityauthorize"
     /** 美博会专题页 */
     private static final String BEAUTY_TOP_PATH = "product/beautytopic";
 
@@ -87,12 +87,13 @@ public class ProductController extends BaseController {
     public String beautytopic() {
         return BEAUTY_TOP_PATH;
     }
+
     /**
-     * 正品联盟授权
+     * 正品联盟品牌授权商品详情页
      */
-    @GetMapping("/product/qualityauthorize.html")
-    public String qualityauthorize() {
-        return PRODUCT_QUALITY_AUTHORIZE;
+    @GetMapping("/auth/product-{id}.html")
+    public String authorization(final Model model, @PathVariable("id") Integer productId) {
+        return null;
     }
 
 }