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

app-hd/controllers/GroupController.php

@@ -14,7 +14,7 @@ class GroupController extends BaseController
     //组合列表 ssh 20220315
     public function actionList()
     {
-        $where = ['mainId' => $this->mainId, 'delete_status' => 0];
+        $where = ['mainId' => $this->mainId, 'deleteStatus' => 0];
         $list = GroupClass::getGroupList($where);
         util::success($list);
     }
@@ -33,7 +33,7 @@ class GroupController extends BaseController
         $id = Yii::$app->request->post('id');
         $group = GroupClass::getById($id, true);
         GroupClass::valid($group, $this->mainId);
-        GroupClass::updateById($id, ['delete_status' => 1]);
+        GroupClass::updateById($id, ['deleteStatus' => 1]);
         util::complete();
     }
 }

sql.sql

@@ -1019,4 +1019,4 @@ ALTER TABLE xhGhsOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `s
 ALTER TABLE xhCgItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `itemId`;
 ALTER TABLE xhGhsOrderItem MODIFY `itemId` INT(11) NOT NULL DEFAULT '0' COMMENT '平台花材id';
 ALTER TABLE xhShop MODIFY `cgModel` TINYINT(4) NOT NULL DEFAULT 0 COMMENT '0标准模式 1简约模式';
-ALTER TABLE xhGroup ADD COLUMN `delete_status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除：0.未删除 1.删除' AFTER num;
+ALTER TABLE xhGroup ADD COLUMN `deleteStatus` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除：0.未删除 1.删除' AFTER num;