Merge branch 'master' of git.huaml.com:zhh/huahuibao

biz-ghs/shop/classes/MainClass.php

@@ -16,7 +16,7 @@ class MainClass extends BaseClass
         return self::add(['id' => null], true);
     }
 
-    //创建main并初始化花材 ssh 20220502
+    //首次开店时创建main并初始化花材 ssh 20220502
     public static function addMainInitItem()
     {
         $main = self::addMain();
@@ -25,7 +25,7 @@ class MainClass extends BaseClass
         return $main;
     }
 
-    //创建main并复制花材 ssh 20220502
+    //新建门店时创建main并复制花材 ssh 20220502
     public static function addMainCopyItem($beforeMainId)
     {
         $main = self::addMain();

biz-hd/item/classes/ItemClass.php

@@ -357,7 +357,7 @@ class ItemClass extends BaseClass
     //初始化花材 lqh 2021.4.12  modify ssh 20210711
     public static function initItem($mainId)
     {
-        $ptClass = PtItemCatClass::getAllList("*", ['type' => 0], 'inTurn desc');
+        $ptClass = PtItemCatClass::getAllList("*", ['type' => 1], 'inTurn desc');
         if (empty($ptClass)) {
             return false;
         }