Merge branch 'master' into dev

app/controller/api/store/merchant/Taskorderguquan.php

@@ -29,14 +29,14 @@ class Taskorderguquan
         13521438652徐立苹400
         15832971815孟晓玮300
         18600200909陈冠霖300
-        15810064711 王   玲 300
-        13932925303会强300
-        13901074090陈玉刚300
+        15810064711 王   玲 400
+        13932925303会强400
+        13901074090陈玉刚400
         13381085923王建军100
         13601071082隋彩云300
         18001316701闫旭300
         13601179856陈瑞元50
-        13161909228刘银霞100
+        13161909228刘银霞50
         18760167163刘春梅100
         13215917919李小秋100
         13801358713金波50
@@ -44,8 +44,11 @@ class Taskorderguquan
         15332507711张传莲50
         15960349667吕丽娣50
         13231658486周军市场补贴500
+        18513005403王培50
         18612051372李金俭 50
         15803242611王志敏50
+        13701059062王金权50
+        13331043787张吉良126
         18715313601大饼400
         */
         $data = [
@@ -59,22 +62,25 @@ class Taskorderguquan
             '13521438652' => 400,
             '15832971815' => 300,
             '18600200909' => 300,
-            '15810064711' => 300,
-            '13932925303' => 300,
-            '13901074090' => 300,
+            '15810064711' => 400,
+            '13932925303' => 400,
+            '13901074090' => 400,
             '13381085923' => 100,
             '13601071082' => 300,
             '18001316701' => 300,
             '13601179856' => 50,
-            '13161909228' => 100,
+            '13161909228' => 50,
             '18760167163' => 100,
             '13215917919' => 100,
             '13801358713' => 50,
             '15321221558' => 200,
             '15332507711' => 50,
             '15960349667' => 50,
+            '18513005403' => 50,
             '18612051372' => 50,
             '15803242611' => 50,
+            '13701059062' => 50,
+            '13331043787' => 126,
             '18715313601' => 400
         ];