Merge remote-tracking branch 'origin/master'

src/Common/Entity/Split.php

@@ -63,7 +63,13 @@ class Split
         $splitCollector = SplitCollector::getCollector();
         $splitCollector = SplitCollector::getCollector();
         $splitNum = $splitCollector[$className]['num'];
         $splitNum = $splitCollector[$className]['num'];
         $data = RequestContext::getContextData();
         $data = RequestContext::getContextData();
+        $dbNum = $data['dbNum'];
+        if ( ! empty($dbNum) ) {//若手动设置的分表信息则直接返回设置的表号
+            return $dbNum;
+        }
+
         $storeId = $data['userInfo']['storeId'];
         $storeId = $data['userInfo']['storeId'];
+
         if ( empty($storeId) ) {
         if ( empty($storeId) ) {
             throw new CommonException(["msg" => "参数异常，获取店铺信息失败。"]);
             throw new CommonException(["msg" => "参数异常，获取店铺信息失败。"]);
         }
         }