郭盛 / scrap · 提交

转到一个项目

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

修改备注

内嵌 并排对比
正在显示 2 个修改的文件 包含 59 行增加 和 84 行删除
... ... @@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -62,8 +63,8 @@
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" />
<state relative-caret-position="-152">
<caret line="833" column="7" lean-forward="true" selection-start-line="833" selection-start-column="7" selection-end-line="833" selection-end-column="7" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -77,41 +78,28 @@
<element signature="e#4919#5120#0#PHP" expanded="false" />
<element signature="e#5126#5388#0#PHP" expanded="false" />
<element signature="e#5393#5598#0#PHP" expanded="false" />
<element signature="e#5604#6046#0#PHP" expanded="false" />
<element signature="e#6051#7279#0#PHP" expanded="false" />
<element signature="e#7302#7847#0#PHP" expanded="false" />
<element signature="e#7853#8134#0#PHP" expanded="false" />
<element signature="e#8139#8531#0#PHP" expanded="false" />
<element signature="e#8537#9086#0#PHP" expanded="false" />
<element signature="e#9091#10290#0#PHP" expanded="false" />
<element signature="e#10296#10753#0#PHP" expanded="false" />
<element signature="e#10758#12021#0#PHP" expanded="false" />
<element signature="e#12044#12396#0#PHP" expanded="false" />
<element signature="e#12402#13086#0#PHP" expanded="false" />
<element signature="e#13091#14350#0#PHP" expanded="false" />
<element signature="e#14356#14818#0#PHP" expanded="false" />
<element signature="e#14823#17028#0#PHP" expanded="false" />
<element signature="e#17034#17643#0#PHP" expanded="false" />
<element signature="e#17648#18981#0#PHP" expanded="false" />
<element signature="e#18987#19344#0#PHP" expanded="false" />
<element signature="e#19349#20230#0#PHP" expanded="false" />
<element signature="e#20236#20588#0#PHP" expanded="false" />
<element signature="e#20593#21670#0#PHP" expanded="false" />
<element signature="e#21676#22031#0#PHP" expanded="false" />
<element signature="e#22036#23116#0#PHP" expanded="false" />
<element signature="e#23122#23546#0#PHP" expanded="false" />
<element signature="e#23551#24162#0#PHP" expanded="false" />
<element signature="e#24168#24664#0#PHP" expanded="false" />
<element signature="e#24669#25776#0#PHP" expanded="false" />
<element signature="e#25782#26066#0#PHP" expanded="false" />
<element signature="e#26071#26649#0#PHP" expanded="false" />
<element signature="e#26670#26989#0#PHP" expanded="false" />
<element signature="e#26995#27403#0#PHP" expanded="false" />
<element signature="e#27409#28168#0#PHP" expanded="false" />
<element signature="e#28188#29052#0#PHP" expanded="false" />
<element signature="e#29079#29479#0#PHP" expanded="false" />
<element signature="e#29503#30076#0#PHP" expanded="false" />
<element signature="e#30099#30909#0#PHP" expanded="false" />
<element signature="e#6050#7278#0#PHP" expanded="false" />
<element signature="e#7301#7846#0#PHP" expanded="false" />
<element signature="e#8137#8529#0#PHP" expanded="false" />
<element signature="e#9088#10287#0#PHP" expanded="false" />
<element signature="e#10754#12017#0#PHP" expanded="false" />
<element signature="e#12040#12392#0#PHP" expanded="false" />
<element signature="e#13087#14346#0#PHP" expanded="false" />
<element signature="e#14818#17023#0#PHP" expanded="false" />
<element signature="e#17643#18976#0#PHP" expanded="false" />
<element signature="e#19344#20225#0#PHP" expanded="false" />
<element signature="e#20588#21665#0#PHP" expanded="false" />
<element signature="e#22031#23111#0#PHP" expanded="false" />
<element signature="e#23546#24157#0#PHP" expanded="false" />
<element signature="e#24664#25771#0#PHP" expanded="false" />
<element signature="e#26066#26644#0#PHP" expanded="false" />
<element signature="e#26665#26984#0#PHP" expanded="false" />
<element signature="e#26990#27398#0#PHP" expanded="false" />
<element signature="e#27404#28163#0#PHP" expanded="false" />
<element signature="e#28183#29047#0#PHP" expanded="false" />
<element signature="e#29074#29474#0#PHP" expanded="false" />
<element signature="e#29498#30071#0#PHP" expanded="false" />
<element signature="e#30094#30904#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -206,8 +194,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="302" />
<option name="y" value="62" />
<option name="x" value="418" />
<option name="y" value="66" />
<option name="width" value="1582" />
<option name="height" value="960" />
</component>
... ... @@ -352,15 +340,15 @@
<workItem from="1575332430854" duration="21245000" />
<workItem from="1575359408189" duration="10054000" />
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="1612000" />
<workItem from="1575420787741" duration="2280000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="443968000" />
<option name="totallyTimeSpent" value="444636000" />
</component>
<component name="ToolWindowManager">
<frame x="302" y="62" width="1582" height="960" extended-state="0" />
<frame x="418" y="66" width="1582" height="960" extended-state="0" />
<editor active="true" />
<layout>
<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 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" />
<state relative-caret-position="-152">
<caret line="833" column="7" lean-forward="true" selection-start-line="833" selection-start-column="7" selection-end-line="833" selection-end-column="7" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -873,41 +861,28 @@
<element signature="e#4919#5120#0#PHP" expanded="false" />
<element signature="e#5126#5388#0#PHP" expanded="false" />
<element signature="e#5393#5598#0#PHP" expanded="false" />
<element signature="e#5604#6046#0#PHP" expanded="false" />
<element signature="e#6051#7279#0#PHP" expanded="false" />
<element signature="e#7302#7847#0#PHP" expanded="false" />
<element signature="e#7853#8134#0#PHP" expanded="false" />
<element signature="e#8139#8531#0#PHP" expanded="false" />
<element signature="e#8537#9086#0#PHP" expanded="false" />
<element signature="e#9091#10290#0#PHP" expanded="false" />
<element signature="e#10296#10753#0#PHP" expanded="false" />
<element signature="e#10758#12021#0#PHP" expanded="false" />
<element signature="e#12044#12396#0#PHP" expanded="false" />
<element signature="e#12402#13086#0#PHP" expanded="false" />
<element signature="e#13091#14350#0#PHP" expanded="false" />
<element signature="e#14356#14818#0#PHP" expanded="false" />
<element signature="e#14823#17028#0#PHP" expanded="false" />
<element signature="e#17034#17643#0#PHP" expanded="false" />
<element signature="e#17648#18981#0#PHP" expanded="false" />
<element signature="e#18987#19344#0#PHP" expanded="false" />
<element signature="e#19349#20230#0#PHP" expanded="false" />
<element signature="e#20236#20588#0#PHP" expanded="false" />
<element signature="e#20593#21670#0#PHP" expanded="false" />
<element signature="e#21676#22031#0#PHP" expanded="false" />
<element signature="e#22036#23116#0#PHP" expanded="false" />
<element signature="e#23122#23546#0#PHP" expanded="false" />
<element signature="e#23551#24162#0#PHP" expanded="false" />
<element signature="e#24168#24664#0#PHP" expanded="false" />
<element signature="e#24669#25776#0#PHP" expanded="false" />
<element signature="e#25782#26066#0#PHP" expanded="false" />
<element signature="e#26071#26649#0#PHP" expanded="false" />
<element signature="e#26670#26989#0#PHP" expanded="false" />
<element signature="e#26995#27403#0#PHP" expanded="false" />
<element signature="e#27409#28168#0#PHP" expanded="false" />
<element signature="e#28188#29052#0#PHP" expanded="false" />
<element signature="e#29079#29479#0#PHP" expanded="false" />
<element signature="e#29503#30076#0#PHP" expanded="false" />
<element signature="e#30099#30909#0#PHP" expanded="false" />
<element signature="e#6050#7278#0#PHP" expanded="false" />
<element signature="e#7301#7846#0#PHP" expanded="false" />
<element signature="e#8137#8529#0#PHP" expanded="false" />
<element signature="e#9088#10287#0#PHP" expanded="false" />
<element signature="e#10754#12017#0#PHP" expanded="false" />
<element signature="e#12040#12392#0#PHP" expanded="false" />
<element signature="e#13087#14346#0#PHP" expanded="false" />
<element signature="e#14818#17023#0#PHP" expanded="false" />
<element signature="e#17643#18976#0#PHP" expanded="false" />
<element signature="e#19344#20225#0#PHP" expanded="false" />
<element signature="e#20588#21665#0#PHP" expanded="false" />
<element signature="e#22031#23111#0#PHP" expanded="false" />
<element signature="e#23546#24157#0#PHP" expanded="false" />
<element signature="e#24664#25771#0#PHP" expanded="false" />
<element signature="e#26066#26644#0#PHP" expanded="false" />
<element signature="e#26665#26984#0#PHP" expanded="false" />
<element signature="e#26990#27398#0#PHP" expanded="false" />
<element signature="e#27404#28163#0#PHP" expanded="false" />
<element signature="e#28183#29047#0#PHP" expanded="false" />
<element signature="e#29074#29474#0#PHP" expanded="false" />
<element signature="e#29498#30071#0#PHP" expanded="false" />
<element signature="e#30094#30904#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -223,7 +223,7 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:status require:1 other desc: 订单状态(不传或者为0是 已预约，1已接单，2已完成)
* @param name:status require:1 other desc:订单状态(不传或者为0是 已预约，1已接单，2已完成)
*
* @return id:订单ID
* @return num:订单号
... ... @@ -293,7 +293,7 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:order_id require:1 other desc: 订单id
* @param name:order_id require:1 other desc:订单id
*
*
*/
... ... @@ -321,7 +321,7 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:order_id type:int require:1 default: desc:回收订单ID
* @param name:order_id type:int require:1 default:desc:回收订单ID
*
* @return status:状态(0已预约，1已接单，2已完成)
* @return num:订单号
... ... @@ -374,7 +374,7 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:status require:1 other desc: 订单状态(不传或者为0是 已兑换，1已发货，2已完成)
* @param name:status require:1 other desc:订单状态(不传或者为0是 已兑换，1已发货，2已完成)
*
* @return id:订单ID
* @return num:订单号
... ... @@ -494,7 +494,7 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:status require:1 other desc: 订单状态(1已预约，2已接单，3已完成)
* @param name:status require:1 other desc:订单状态(1已预约，2已接单，3已完成)
*
* @return id:订单ID
* @return num:订单号
... ...