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

# Conflicts:
#	src/main/java/com/caimei365/commodity/utils/AppletsLinkUtil.java

src/main/java/com/caimei365/commodity/utils/AppletsLinkUtil.java

@@ -155,7 +155,14 @@ public class AppletsLinkUtil {
      * 29领券中心
      */
     public static final Pattern pattern45 = Pattern.compile("/user/coupon-collection.html");
-    public static final Pattern pattern46 = Pattern.compile("/quickOperation/operation-");
+    /**
+     * 招商入驻
+     */
+    public static final Pattern pattern46 = Pattern.compile("/supplier/attraction.html");
+    /**
+     * 快捷运营
+     */
+    public static final Pattern pattern47 = Pattern.compile("/quickOperation/operation-");
 
     /**
      * 根据链接判断链接类型
@@ -197,7 +204,7 @@ public class AppletsLinkUtil {
                 return 16;
             } else if (pattern29.matcher(link).find() || pattern30.matcher(link).find()) {
                 return 17;
-            } else if (pattern31.matcher(link).find()) {
+            } else if (pattern46.matcher(link).find() || pattern31.matcher(link).find()) {
                 return 18;
             } else if (pattern32.matcher(link).find()) {
                 return 19;
@@ -222,7 +229,7 @@ public class AppletsLinkUtil {
                 return 28;
             } else if (pattern45.matcher(link).find()) {
                 return 29;
-            } else if (pattern46.matcher(link).find()) {
+            } else if (pattern47.matcher(link).find()) {
                 return 30;
             } else {
                 return -1;