3 Commits 6fccc77bdd ... b886dfd634

Author SHA1 Message Date
  shensong00 b886dfd634 调试 16 hours ago
  shensong00 aad4f3760f Merge branch 'priority' into dev/test 16 hours ago
  shensong00 2a7f22985c 调试 16 hours ago

+ 1 - 1
app/Console/Commands/CorpInformation/BatchMarkTagDeal.php

@@ -111,7 +111,7 @@ class BatchMarkTagDeal extends Command
111 111
             return false;
112 112
         }
113 113
 
114
-        $tagList = json_decode($taskInfo['task_list'], 1);
114
+        $tagList = json_decode($taskInfo['tag_list'], 1);
115 115
         // 标签转化
116 116
         $newTagList = Tag::query()->where('corpid', $taskInfo['corpid'])->where('enable', 1)
117 117
             ->whereIn('tag_md5', $tagList)->get();

+ 1 - 1
app/Http/Controllers/Api/OrderController.php

@@ -257,4 +257,4 @@ class OrderController extends Controller
257 257
         $data = OrderService::getShareInProportionConf($sysGroupId);
258 258
         return self::returnValue($data);
259 259
     }
260
-}
260
+}