郭盛 / scrap · 提交

转到一个项目

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

备注信息

内嵌 并排对比
正在显示 2 个修改的文件 包含 62 行增加 和 62 行删除
... ... @@ -2,8 +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/model/ShopgoodsModel.php" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -70,40 +69,40 @@
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<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="375">
<caret line="68" column="53" lean-forward="false" selection-start-line="68" selection-start-column="53" selection-end-line="68" selection-end-column="53" />
<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" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#2079#2297#0#PHP" expanded="false" />
<element signature="e#2302#2510#0#PHP" expanded="false" />
<element signature="e#2516#2992#0#PHP" expanded="false" />
<element signature="e#2997#3515#0#PHP" expanded="false" />
<element signature="e#3521#4033#0#PHP" expanded="false" />
<element signature="e#4038#4601#0#PHP" expanded="false" />
<element signature="e#4607#5104#0#PHP" expanded="false" />
<element signature="e#5109#5949#0#PHP" expanded="false" />
<element signature="e#5955#6273#0#PHP" expanded="false" />
<element signature="e#6278#6654#0#PHP" expanded="false" />
<element signature="e#6660#7015#0#PHP" expanded="false" />
<element signature="e#7020#7429#0#PHP" expanded="false" />
<element signature="e#7435#7820#0#PHP" expanded="false" />
<element signature="e#7825#8496#0#PHP" expanded="false" />
<element signature="e#8502#8948#0#PHP" expanded="false" />
<element signature="e#8953#9804#0#PHP" expanded="false" />
<element signature="e#9810#10080#0#PHP" expanded="false" />
<element signature="e#10085#10561#0#PHP" expanded="false" />
<element signature="e#10567#11127#0#PHP" expanded="false" />
<element signature="e#11132#11959#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" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsModel.php" pinned="false" current-in-tab="true">
<file leaf-file-name="ShopgoodsModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
... ... @@ -188,7 +187,6 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
<option value="$PROJECT_DIR$/public/info.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
... ... @@ -214,6 +212,7 @@
<option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
</list>
</option>
</component>
... ... @@ -232,8 +231,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="96" />
<option name="y" value="116" />
<option name="x" value="256" />
<option name="y" value="85" />
<option name="width" value="1582" />
<option name="height" value="969" />
</component>
... ... @@ -375,15 +374,15 @@
<workItem from="1575016153150" duration="3315000" />
<workItem from="1575246616478" duration="21722000" />
<workItem from="1575278769037" duration="7395000" />
<workItem from="1575332430854" duration="1871000" />
<workItem from="1575332430854" duration="1955000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="412329000" />
<option name="totallyTimeSpent" value="412413000" />
</component>
<component name="ToolWindowManager">
<frame x="96" y="116" width="1582" height="969" extended-state="1" />
<frame x="256" y="85" width="1582" height="969" extended-state="1" />
<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" />
... ... @@ -823,44 +822,44 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="30" column="9" lean-forward="true" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="68" column="53" lean-forward="false" selection-start-line="68" selection-start-column="53" selection-end-line="68" selection-end-column="53" />
<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" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#2079#2297#0#PHP" expanded="false" />
<element signature="e#2302#2510#0#PHP" expanded="false" />
<element signature="e#2516#2992#0#PHP" expanded="false" />
<element signature="e#2997#3515#0#PHP" expanded="false" />
<element signature="e#3521#4033#0#PHP" expanded="false" />
<element signature="e#4038#4601#0#PHP" expanded="false" />
<element signature="e#4607#5104#0#PHP" expanded="false" />
<element signature="e#5109#5949#0#PHP" expanded="false" />
<element signature="e#5955#6273#0#PHP" expanded="false" />
<element signature="e#6278#6654#0#PHP" expanded="false" />
<element signature="e#6660#7015#0#PHP" expanded="false" />
<element signature="e#7020#7429#0#PHP" expanded="false" />
<element signature="e#7435#7820#0#PHP" expanded="false" />
<element signature="e#7825#8496#0#PHP" expanded="false" />
<element signature="e#8502#8948#0#PHP" expanded="false" />
<element signature="e#8953#9804#0#PHP" expanded="false" />
<element signature="e#9810#10080#0#PHP" expanded="false" />
<element signature="e#10085#10561#0#PHP" expanded="false" />
<element signature="e#10567#11127#0#PHP" expanded="false" />
<element signature="e#11132#11959#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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="30" column="9" lean-forward="true" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -55,6 +55,7 @@ class ShopgoodsController extends RestBaseController
*
* @return id:商品ID
* @return shoptype_id:所属类型ID
* @return thumbnail:缩略图
* @return goods_name:商品名称
* @return price:所需积分
*
... ...