郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 449f148b3e15a22a51fa9b50dca6839474cae579 1 个父辈 55577541
1 个管道 的构建 通过 耗费 1 秒

修改备注

内嵌 并排对比
正在显示 2 个修改的文件 包含 59 行增加 和 84 行删除
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -62,8 +63,8 @@ @@ -62,8 +63,8 @@
62 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 63 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
63 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 64 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
64 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="199">  
66 - <caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" /> 66 + <state relative-caret-position="-152">
  67 + <caret line="833" column="7" lean-forward="true" selection-start-line="833" selection-start-column="7" selection-end-line="833" selection-end-column="7" />
67 <folding> 68 <folding>
68 <element signature="e#366#715#0#PHP" expanded="false" /> 69 <element signature="e#366#715#0#PHP" expanded="false" />
69 <element signature="e#720#1485#0#PHP" expanded="false" /> 70 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -77,41 +78,28 @@ @@ -77,41 +78,28 @@
77 <element signature="e#4919#5120#0#PHP" expanded="false" /> 78 <element signature="e#4919#5120#0#PHP" expanded="false" />
78 <element signature="e#5126#5388#0#PHP" expanded="false" /> 79 <element signature="e#5126#5388#0#PHP" expanded="false" />
79 <element signature="e#5393#5598#0#PHP" expanded="false" /> 80 <element signature="e#5393#5598#0#PHP" expanded="false" />
80 - <element signature="e#5604#6046#0#PHP" expanded="false" />  
81 - <element signature="e#6051#7279#0#PHP" expanded="false" />  
82 - <element signature="e#7302#7847#0#PHP" expanded="false" />  
83 - <element signature="e#7853#8134#0#PHP" expanded="false" />  
84 - <element signature="e#8139#8531#0#PHP" expanded="false" />  
85 - <element signature="e#8537#9086#0#PHP" expanded="false" />  
86 - <element signature="e#9091#10290#0#PHP" expanded="false" />  
87 - <element signature="e#10296#10753#0#PHP" expanded="false" />  
88 - <element signature="e#10758#12021#0#PHP" expanded="false" />  
89 - <element signature="e#12044#12396#0#PHP" expanded="false" />  
90 - <element signature="e#12402#13086#0#PHP" expanded="false" />  
91 - <element signature="e#13091#14350#0#PHP" expanded="false" />  
92 - <element signature="e#14356#14818#0#PHP" expanded="false" />  
93 - <element signature="e#14823#17028#0#PHP" expanded="false" />  
94 - <element signature="e#17034#17643#0#PHP" expanded="false" />  
95 - <element signature="e#17648#18981#0#PHP" expanded="false" />  
96 - <element signature="e#18987#19344#0#PHP" expanded="false" />  
97 - <element signature="e#19349#20230#0#PHP" expanded="false" />  
98 - <element signature="e#20236#20588#0#PHP" expanded="false" />  
99 - <element signature="e#20593#21670#0#PHP" expanded="false" />  
100 - <element signature="e#21676#22031#0#PHP" expanded="false" />  
101 - <element signature="e#22036#23116#0#PHP" expanded="false" />  
102 - <element signature="e#23122#23546#0#PHP" expanded="false" />  
103 - <element signature="e#23551#24162#0#PHP" expanded="false" />  
104 - <element signature="e#24168#24664#0#PHP" expanded="false" />  
105 - <element signature="e#24669#25776#0#PHP" expanded="false" />  
106 - <element signature="e#25782#26066#0#PHP" expanded="false" />  
107 - <element signature="e#26071#26649#0#PHP" expanded="false" />  
108 - <element signature="e#26670#26989#0#PHP" expanded="false" />  
109 - <element signature="e#26995#27403#0#PHP" expanded="false" />  
110 - <element signature="e#27409#28168#0#PHP" expanded="false" />  
111 - <element signature="e#28188#29052#0#PHP" expanded="false" />  
112 - <element signature="e#29079#29479#0#PHP" expanded="false" />  
113 - <element signature="e#29503#30076#0#PHP" expanded="false" />  
114 - <element signature="e#30099#30909#0#PHP" expanded="false" /> 81 + <element signature="e#6050#7278#0#PHP" expanded="false" />
  82 + <element signature="e#7301#7846#0#PHP" expanded="false" />
  83 + <element signature="e#8137#8529#0#PHP" expanded="false" />
  84 + <element signature="e#9088#10287#0#PHP" expanded="false" />
  85 + <element signature="e#10754#12017#0#PHP" expanded="false" />
  86 + <element signature="e#12040#12392#0#PHP" expanded="false" />
  87 + <element signature="e#13087#14346#0#PHP" expanded="false" />
  88 + <element signature="e#14818#17023#0#PHP" expanded="false" />
  89 + <element signature="e#17643#18976#0#PHP" expanded="false" />
  90 + <element signature="e#19344#20225#0#PHP" expanded="false" />
  91 + <element signature="e#20588#21665#0#PHP" expanded="false" />
  92 + <element signature="e#22031#23111#0#PHP" expanded="false" />
  93 + <element signature="e#23546#24157#0#PHP" expanded="false" />
  94 + <element signature="e#24664#25771#0#PHP" expanded="false" />
  95 + <element signature="e#26066#26644#0#PHP" expanded="false" />
  96 + <element signature="e#26665#26984#0#PHP" expanded="false" />
  97 + <element signature="e#26990#27398#0#PHP" expanded="false" />
  98 + <element signature="e#27404#28163#0#PHP" expanded="false" />
  99 + <element signature="e#28183#29047#0#PHP" expanded="false" />
  100 + <element signature="e#29074#29474#0#PHP" expanded="false" />
  101 + <element signature="e#29498#30071#0#PHP" expanded="false" />
  102 + <element signature="e#30094#30904#0#PHP" expanded="false" />
115 </folding> 103 </folding>
116 </state> 104 </state>
117 </provider> 105 </provider>
@@ -206,8 +194,8 @@ @@ -206,8 +194,8 @@
206 </component> 194 </component>
207 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 195 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
208 <component name="ProjectFrameBounds"> 196 <component name="ProjectFrameBounds">
209 - <option name="x" value="302" />  
210 - <option name="y" value="62" /> 197 + <option name="x" value="418" />
  198 + <option name="y" value="66" />
211 <option name="width" value="1582" /> 199 <option name="width" value="1582" />
212 <option name="height" value="960" /> 200 <option name="height" value="960" />
213 </component> 201 </component>
@@ -352,15 +340,15 @@ @@ -352,15 +340,15 @@
352 <workItem from="1575332430854" duration="21245000" /> 340 <workItem from="1575332430854" duration="21245000" />
353 <workItem from="1575359408189" duration="10054000" /> 341 <workItem from="1575359408189" duration="10054000" />
354 <workItem from="1575419186725" duration="599000" /> 342 <workItem from="1575419186725" duration="599000" />
355 - <workItem from="1575420787741" duration="1612000" /> 343 + <workItem from="1575420787741" duration="2280000" />
356 </task> 344 </task>
357 <servers /> 345 <servers />
358 </component> 346 </component>
359 <component name="TimeTrackingManager"> 347 <component name="TimeTrackingManager">
360 - <option name="totallyTimeSpent" value="443968000" /> 348 + <option name="totallyTimeSpent" value="444636000" />
361 </component> 349 </component>
362 <component name="ToolWindowManager"> 350 <component name="ToolWindowManager">
363 - <frame x="302" y="62" width="1582" height="960" extended-state="0" /> 351 + <frame x="418" y="66" width="1582" height="960" extended-state="0" />
364 <editor active="true" /> 352 <editor active="true" />
365 <layout> 353 <layout>
366 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17017083" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 354 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17017083" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -858,8 +846,8 @@ @@ -858,8 +846,8 @@
858 </entry> 846 </entry>
859 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 847 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
860 <provider selected="true" editor-type-id="text-editor"> 848 <provider selected="true" editor-type-id="text-editor">
861 - <state relative-caret-position="199">  
862 - <caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" /> 849 + <state relative-caret-position="-152">
  850 + <caret line="833" column="7" lean-forward="true" selection-start-line="833" selection-start-column="7" selection-end-line="833" selection-end-column="7" />
863 <folding> 851 <folding>
864 <element signature="e#366#715#0#PHP" expanded="false" /> 852 <element signature="e#366#715#0#PHP" expanded="false" />
865 <element signature="e#720#1485#0#PHP" expanded="false" /> 853 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -873,41 +861,28 @@ @@ -873,41 +861,28 @@
873 <element signature="e#4919#5120#0#PHP" expanded="false" /> 861 <element signature="e#4919#5120#0#PHP" expanded="false" />
874 <element signature="e#5126#5388#0#PHP" expanded="false" /> 862 <element signature="e#5126#5388#0#PHP" expanded="false" />
875 <element signature="e#5393#5598#0#PHP" expanded="false" /> 863 <element signature="e#5393#5598#0#PHP" expanded="false" />
876 - <element signature="e#5604#6046#0#PHP" expanded="false" />  
877 - <element signature="e#6051#7279#0#PHP" expanded="false" />  
878 - <element signature="e#7302#7847#0#PHP" expanded="false" />  
879 - <element signature="e#7853#8134#0#PHP" expanded="false" />  
880 - <element signature="e#8139#8531#0#PHP" expanded="false" />  
881 - <element signature="e#8537#9086#0#PHP" expanded="false" />  
882 - <element signature="e#9091#10290#0#PHP" expanded="false" />  
883 - <element signature="e#10296#10753#0#PHP" expanded="false" />  
884 - <element signature="e#10758#12021#0#PHP" expanded="false" />  
885 - <element signature="e#12044#12396#0#PHP" expanded="false" />  
886 - <element signature="e#12402#13086#0#PHP" expanded="false" />  
887 - <element signature="e#13091#14350#0#PHP" expanded="false" />  
888 - <element signature="e#14356#14818#0#PHP" expanded="false" />  
889 - <element signature="e#14823#17028#0#PHP" expanded="false" />  
890 - <element signature="e#17034#17643#0#PHP" expanded="false" />  
891 - <element signature="e#17648#18981#0#PHP" expanded="false" />  
892 - <element signature="e#18987#19344#0#PHP" expanded="false" />  
893 - <element signature="e#19349#20230#0#PHP" expanded="false" />  
894 - <element signature="e#20236#20588#0#PHP" expanded="false" />  
895 - <element signature="e#20593#21670#0#PHP" expanded="false" />  
896 - <element signature="e#21676#22031#0#PHP" expanded="false" />  
897 - <element signature="e#22036#23116#0#PHP" expanded="false" />  
898 - <element signature="e#23122#23546#0#PHP" expanded="false" />  
899 - <element signature="e#23551#24162#0#PHP" expanded="false" />  
900 - <element signature="e#24168#24664#0#PHP" expanded="false" />  
901 - <element signature="e#24669#25776#0#PHP" expanded="false" />  
902 - <element signature="e#25782#26066#0#PHP" expanded="false" />  
903 - <element signature="e#26071#26649#0#PHP" expanded="false" />  
904 - <element signature="e#26670#26989#0#PHP" expanded="false" />  
905 - <element signature="e#26995#27403#0#PHP" expanded="false" />  
906 - <element signature="e#27409#28168#0#PHP" expanded="false" />  
907 - <element signature="e#28188#29052#0#PHP" expanded="false" />  
908 - <element signature="e#29079#29479#0#PHP" expanded="false" />  
909 - <element signature="e#29503#30076#0#PHP" expanded="false" />  
910 - <element signature="e#30099#30909#0#PHP" expanded="false" /> 864 + <element signature="e#6050#7278#0#PHP" expanded="false" />
  865 + <element signature="e#7301#7846#0#PHP" expanded="false" />
  866 + <element signature="e#8137#8529#0#PHP" expanded="false" />
  867 + <element signature="e#9088#10287#0#PHP" expanded="false" />
  868 + <element signature="e#10754#12017#0#PHP" expanded="false" />
  869 + <element signature="e#12040#12392#0#PHP" expanded="false" />
  870 + <element signature="e#13087#14346#0#PHP" expanded="false" />
  871 + <element signature="e#14818#17023#0#PHP" expanded="false" />
  872 + <element signature="e#17643#18976#0#PHP" expanded="false" />
  873 + <element signature="e#19344#20225#0#PHP" expanded="false" />
  874 + <element signature="e#20588#21665#0#PHP" expanded="false" />
  875 + <element signature="e#22031#23111#0#PHP" expanded="false" />
  876 + <element signature="e#23546#24157#0#PHP" expanded="false" />
  877 + <element signature="e#24664#25771#0#PHP" expanded="false" />
  878 + <element signature="e#26066#26644#0#PHP" expanded="false" />
  879 + <element signature="e#26665#26984#0#PHP" expanded="false" />
  880 + <element signature="e#26990#27398#0#PHP" expanded="false" />
  881 + <element signature="e#27404#28163#0#PHP" expanded="false" />
  882 + <element signature="e#28183#29047#0#PHP" expanded="false" />
  883 + <element signature="e#29074#29474#0#PHP" expanded="false" />
  884 + <element signature="e#29498#30071#0#PHP" expanded="false" />
  885 + <element signature="e#30094#30904#0#PHP" expanded="false" />
911 </folding> 886 </folding>
912 </state> 887 </state>
913 </provider> 888 </provider>
@@ -223,7 +223,7 @@ class UserController extends RestBaseController @@ -223,7 +223,7 @@ class UserController extends RestBaseController
223 * 223 *
224 * @header name:XX-Token require:1 default: desc:token 224 * @header name:XX-Token require:1 default: desc:token
225 * 225 *
226 - * @param name:status require:1 other desc: 订单状态(不传或者为0是 已预约，1已接单，2已完成) 226 + * @param name:status require:1 other desc:订单状态(不传或者为0是 已预约，1已接单，2已完成)
227 * 227 *
228 * @return id:订单ID 228 * @return id:订单ID
229 * @return num:订单号 229 * @return num:订单号
@@ -293,7 +293,7 @@ class UserController extends RestBaseController @@ -293,7 +293,7 @@ class UserController extends RestBaseController
293 * 293 *
294 * @header name:XX-Token require:1 default: desc:token 294 * @header name:XX-Token require:1 default: desc:token
295 * 295 *
296 - * @param name:order_id require:1 other desc: 订单id 296 + * @param name:order_id require:1 other desc:订单id
297 * 297 *
298 * 298 *
299 */ 299 */
@@ -321,7 +321,7 @@ class UserController extends RestBaseController @@ -321,7 +321,7 @@ class UserController extends RestBaseController
321 * 321 *
322 * @header name:XX-Token require:1 default: desc:token 322 * @header name:XX-Token require:1 default: desc:token
323 * 323 *
324 - * @param name:order_id type:int require:1 default: desc:回收订单ID 324 + * @param name:order_id type:int require:1 default:desc:回收订单ID
325 * 325 *
326 * @return status:状态(0已预约，1已接单，2已完成) 326 * @return status:状态(0已预约，1已接单，2已完成)
327 * @return num:订单号 327 * @return num:订单号
@@ -374,7 +374,7 @@ class UserController extends RestBaseController @@ -374,7 +374,7 @@ class UserController extends RestBaseController
374 * 374 *
375 * @header name:XX-Token require:1 default: desc:token 375 * @header name:XX-Token require:1 default: desc:token
376 * 376 *
377 - * @param name:status require:1 other desc: 订单状态(不传或者为0是 已兑换，1已发货，2已完成) 377 + * @param name:status require:1 other desc:订单状态(不传或者为0是 已兑换，1已发货，2已完成)
378 * 378 *
379 * @return id:订单ID 379 * @return id:订单ID
380 * @return num:订单号 380 * @return num:订单号
@@ -494,7 +494,7 @@ class UserController extends RestBaseController @@ -494,7 +494,7 @@ class UserController extends RestBaseController
494 * 494 *
495 * @header name:XX-Token require:1 default: desc:token 495 * @header name:XX-Token require:1 default: desc:token
496 * 496 *
497 - * @param name:status require:1 other desc: 订单状态(1已预约，2已接单，3已完成) 497 + * @param name:status require:1 other desc:订单状态(1已预约，2已接单，3已完成)
498 * 498 *
499 * @return id:订单ID 499 * @return id:订单ID
500 * @return num:订单号 500 * @return num:订单号