Merge branch 'master' into clear-cg

console/controllers/ItemController.php

@@ -36,12 +36,12 @@ class ItemController extends Controller
 
     public $sjId, $shopId, $sj;
 
-    //复制迁移花材 ssh 20251210
+    //复制迁移花材，请用这个方法，其他方法不用看了。迁移前从分类和花材清掉，然后下面相应的mainId修改一下就好了。 ssh 20260607
     public function actionMigrate()
     {
         if (getenv('YII_ENV') == 'production') {
-            $newMainId = 92739;
-            $oldMainId = 65381;
+            $newMainId = 97789;
+            $oldMainId = 42940;
         } else {
             $newMainId = 762;
             $oldMainId = 644;
@@ -772,4 +772,4 @@ class ItemController extends Controller
         }
     }
 
-}
+}