郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 b189c26703f77db3c3728266a755f295f88d5b4d 1 个父辈 b56ed2e5
1 个管道 的构建 通过 耗费 0 秒

修改备注

内嵌 并排对比
正在显示 2 个修改的文件 包含 47 行增加 和 46 行删除
... ... @@ -72,31 +72,31 @@
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="57" column="28" lean-forward="false" selection-start-line="57" selection-start-column="28" selection-end-line="57" selection-end-column="28" />
<state relative-caret-position="327">
<caret line="115" column="25" lean-forward="true" selection-start-line="115" selection-start-column="25" selection-end-line="115" selection-end-column="25" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3021#0#PHP" expanded="false" />
<element signature="e#3026#3544#0#PHP" expanded="false" />
<element signature="e#3550#4062#0#PHP" expanded="false" />
<element signature="e#4067#4630#0#PHP" expanded="false" />
<element signature="e#4636#5133#0#PHP" expanded="false" />
<element signature="e#5138#5978#0#PHP" expanded="false" />
<element signature="e#5984#6302#0#PHP" expanded="false" />
<element signature="e#6307#6683#0#PHP" expanded="false" />
<element signature="e#6689#7044#0#PHP" expanded="false" />
<element signature="e#7049#7458#0#PHP" expanded="false" />
<element signature="e#7464#7849#0#PHP" expanded="false" />
<element signature="e#7854#8525#0#PHP" expanded="false" />
<element signature="e#8531#8977#0#PHP" expanded="false" />
<element signature="e#8982#9833#0#PHP" expanded="false" />
<element signature="e#9839#10109#0#PHP" expanded="false" />
<element signature="e#10114#10590#0#PHP" expanded="false" />
<element signature="e#10596#11156#0#PHP" expanded="false" />
<element signature="e#11161#11988#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5164#0#PHP" expanded="false" />
<element signature="e#5169#6009#0#PHP" expanded="false" />
<element signature="e#6015#6333#0#PHP" expanded="false" />
<element signature="e#6338#6714#0#PHP" expanded="false" />
<element signature="e#6720#7075#0#PHP" expanded="false" />
<element signature="e#7080#7489#0#PHP" expanded="false" />
<element signature="e#7495#7880#0#PHP" expanded="false" />
<element signature="e#7885#8556#0#PHP" expanded="false" />
<element signature="e#8562#9008#0#PHP" expanded="false" />
<element signature="e#9013#9864#0#PHP" expanded="false" />
<element signature="e#9870#10140#0#PHP" expanded="false" />
<element signature="e#10145#10621#0#PHP" expanded="false" />
<element signature="e#10627#11187#0#PHP" expanded="false" />
<element signature="e#11192#12019#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -230,9 +230,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="256" />
<option name="y" value="85" />
<component name="ProjectFrameBounds">
<option name="x" value="292" />
<option name="y" value="65" />
<option name="width" value="1582" />
<option name="height" value="969" />
</component>
... ... @@ -374,15 +374,15 @@
<workItem from="1575016153150" duration="3315000" />
<workItem from="1575246616478" duration="21722000" />
<workItem from="1575278769037" duration="7395000" />
<workItem from="1575332430854" duration="1955000" />
<workItem from="1575332430854" duration="2151000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="412413000" />
<option name="totallyTimeSpent" value="412609000" />
</component>
<component name="ToolWindowManager">
<frame x="256" y="85" width="1582" height="969" extended-state="1" />
<frame x="292" y="65" width="1582" height="969" 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.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -832,31 +832,31 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="57" column="28" lean-forward="false" selection-start-line="57" selection-start-column="28" selection-end-line="57" selection-end-column="28" />
<state relative-caret-position="327">
<caret line="115" column="25" lean-forward="true" selection-start-line="115" selection-start-column="25" selection-end-line="115" selection-end-column="25" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3021#0#PHP" expanded="false" />
<element signature="e#3026#3544#0#PHP" expanded="false" />
<element signature="e#3550#4062#0#PHP" expanded="false" />
<element signature="e#4067#4630#0#PHP" expanded="false" />
<element signature="e#4636#5133#0#PHP" expanded="false" />
<element signature="e#5138#5978#0#PHP" expanded="false" />
<element signature="e#5984#6302#0#PHP" expanded="false" />
<element signature="e#6307#6683#0#PHP" expanded="false" />
<element signature="e#6689#7044#0#PHP" expanded="false" />
<element signature="e#7049#7458#0#PHP" expanded="false" />
<element signature="e#7464#7849#0#PHP" expanded="false" />
<element signature="e#7854#8525#0#PHP" expanded="false" />
<element signature="e#8531#8977#0#PHP" expanded="false" />
<element signature="e#8982#9833#0#PHP" expanded="false" />
<element signature="e#9839#10109#0#PHP" expanded="false" />
<element signature="e#10114#10590#0#PHP" expanded="false" />
<element signature="e#10596#11156#0#PHP" expanded="false" />
<element signature="e#11161#11988#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5164#0#PHP" expanded="false" />
<element signature="e#5169#6009#0#PHP" expanded="false" />
<element signature="e#6015#6333#0#PHP" expanded="false" />
<element signature="e#6338#6714#0#PHP" expanded="false" />
<element signature="e#6720#7075#0#PHP" expanded="false" />
<element signature="e#7080#7489#0#PHP" expanded="false" />
<element signature="e#7495#7880#0#PHP" expanded="false" />
<element signature="e#7885#8556#0#PHP" expanded="false" />
<element signature="e#8562#9008#0#PHP" expanded="false" />
<element signature="e#9013#9864#0#PHP" expanded="false" />
<element signature="e#9870#10140#0#PHP" expanded="false" />
<element signature="e#10145#10621#0#PHP" expanded="false" />
<element signature="e#10627#11187#0#PHP" expanded="false" />
<element signature="e#11192#12019#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -111,6 +111,7 @@ class ShopgoodsController extends RestBaseController
*
* @return id:商品ID
* @return shoptype_id:所属类型ID
* @return thumbnail:商品缩略图
* @return goods_name:商品名称
* @return price:所需积分
*
... ...