解决冲突

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

@@ -362,14 +362,6 @@ public class ProductController extends BaseController {
         return PRODUCT_SUPPORTING_PATH;
     }
 
-    /**
-     * H5配套商品页
-     */
-    @GetMapping("/attestation.html")
-    public String getActivityAttestaion() {
-        return ACTIVITY_ATTESTAION;
-    }
-
     /**
      * H5配套商品页
      */