修改冲突

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

@@ -23,22 +23,19 @@ class Taskorderguquan
         13333069689魏   新200
         13959100621周金花100
         13701061395李素红50
-        17501006833邢艳丽100
+        17501006833邢艳丽50
         15631982690魏震洪50
         18603401312黄金花50
         13521438652徐立苹50
         15832971815孟晓玮50
-        18600200909陈冠霖100
-        15810064711 王   玲 100
+        15810064711 王   玲 50
         13932925303会强50
         13601071082隋彩云100
-        18001316701闫旭100
         13601179856陈瑞元20
         13161909228刘银霞20
         18760167163刘春梅20
         13215917919李小秋20
         13231658486周军市场补贴200
-        13331043787张吉良55
         18715313601大饼100
          */
         $data = [
@@ -46,21 +43,18 @@ class Taskorderguquan
             '13333069689' => 200,
             '13959100621' => 100,
             '13701061395' => 50,
-            '17501006833' => 100,
+            '17501006833' => 50,
             '15631982690' => 50,
             '18603401312' => 50,
             '13521438652' => 50,
             '15832971815' => 50,
-            '18600200909' => 100,
-            '15810064711' => 100,
+            '15810064711' => 50,
             '13932925303' => 50,
             '13601071082' => 100,
-            '18001316701' => 100,
             '13601179856' => 20,
             '13161909228' => 20,
             '18760167163' => 20,
             '13215917919' => 20,
-            '13331043787' => 55,
             '18715313601' => 100
         ];