|
@@ -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="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
4
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
5
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
5
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
|
6
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
|
6
|
</list>
|
7
|
</list>
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -67,8 +68,8 @@ |
|
@@ -67,8 +68,8 @@ |
67
|
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
|
68
|
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
|
68
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
69
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
69
|
<provider selected="true" editor-type-id="text-editor">
|
70
|
<provider selected="true" editor-type-id="text-editor">
|
70
|
- <state relative-caret-position="306">
|
|
|
71
|
- <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
|
71
|
+ <state relative-caret-position="289">
|
|
|
72
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
72
|
</state>
|
73
|
</state>
|
73
|
</provider>
|
74
|
</provider>
|
74
|
</entry>
|
75
|
</entry>
|
|
@@ -448,28 +449,7 @@ |
|
@@ -448,28 +449,7 @@ |
448
|
<workItem from="1572223206994" duration="28857000" />
|
449
|
<workItem from="1572223206994" duration="28857000" />
|
449
|
<workItem from="1572309778506" duration="26117000" />
|
450
|
<workItem from="1572309778506" duration="26117000" />
|
450
|
<workItem from="1572395935540" duration="28313000" />
|
451
|
<workItem from="1572395935540" duration="28313000" />
|
451
|
- <workItem from="1572483209367" duration="14023000" />
|
|
|
452
|
- </task>
|
|
|
453
|
- <task id="LOCAL-00001" summary="数据库配置">
|
|
|
454
|
- <created>1571972429395</created>
|
|
|
455
|
- <option name="number" value="00001" />
|
|
|
456
|
- <option name="presentableId" value="LOCAL-00001" />
|
|
|
457
|
- <option name="project" value="LOCAL" />
|
|
|
458
|
- <updated>1571972429395</updated>
|
|
|
459
|
- </task>
|
|
|
460
|
- <task id="LOCAL-00002" summary="微信公众平台配置">
|
|
|
461
|
- <created>1571972572694</created>
|
|
|
462
|
- <option name="number" value="00002" />
|
|
|
463
|
- <option name="presentableId" value="LOCAL-00002" />
|
|
|
464
|
- <option name="project" value="LOCAL" />
|
|
|
465
|
- <updated>1571972572694</updated>
|
|
|
466
|
- </task>
|
|
|
467
|
- <task id="LOCAL-00003" summary="调试授权">
|
|
|
468
|
- <created>1571972828504</created>
|
|
|
469
|
- <option name="number" value="00003" />
|
|
|
470
|
- <option name="presentableId" value="LOCAL-00003" />
|
|
|
471
|
- <option name="project" value="LOCAL" />
|
|
|
472
|
- <updated>1571972828504</updated>
|
452
|
+ <workItem from="1572483209367" duration="14272000" />
|
473
|
</task>
|
453
|
</task>
|
474
|
<task id="LOCAL-00004" summary="调试授权">
|
454
|
<task id="LOCAL-00004" summary="调试授权">
|
475
|
<created>1571975677420</created>
|
455
|
<created>1571975677420</created>
|
|
@@ -793,11 +773,32 @@ |
|
@@ -793,11 +773,32 @@ |
793
|
<option name="project" value="LOCAL" />
|
773
|
<option name="project" value="LOCAL" />
|
794
|
<updated>1572504885453</updated>
|
774
|
<updated>1572504885453</updated>
|
795
|
</task>
|
775
|
</task>
|
796
|
- <option name="localTasksCounter" value="50" />
|
776
|
+ <task id="LOCAL-00050" summary="调试授权登录">
|
|
|
777
|
+ <created>1572504923532</created>
|
|
|
778
|
+ <option name="number" value="00050" />
|
|
|
779
|
+ <option name="presentableId" value="LOCAL-00050" />
|
|
|
780
|
+ <option name="project" value="LOCAL" />
|
|
|
781
|
+ <updated>1572504923532</updated>
|
|
|
782
|
+ </task>
|
|
|
783
|
+ <task id="LOCAL-00051" summary="调试授权登录">
|
|
|
784
|
+ <created>1572505046783</created>
|
|
|
785
|
+ <option name="number" value="00051" />
|
|
|
786
|
+ <option name="presentableId" value="LOCAL-00051" />
|
|
|
787
|
+ <option name="project" value="LOCAL" />
|
|
|
788
|
+ <updated>1572505046783</updated>
|
|
|
789
|
+ </task>
|
|
|
790
|
+ <task id="LOCAL-00052" summary="调试授权登录">
|
|
|
791
|
+ <created>1572505152338</created>
|
|
|
792
|
+ <option name="number" value="00052" />
|
|
|
793
|
+ <option name="presentableId" value="LOCAL-00052" />
|
|
|
794
|
+ <option name="project" value="LOCAL" />
|
|
|
795
|
+ <updated>1572505152338</updated>
|
|
|
796
|
+ </task>
|
|
|
797
|
+ <option name="localTasksCounter" value="53" />
|
797
|
<servers />
|
798
|
<servers />
|
798
|
</component>
|
799
|
</component>
|
799
|
<component name="TimeTrackingManager">
|
800
|
<component name="TimeTrackingManager">
|
800
|
- <option name="totallyTimeSpent" value="227561000" />
|
801
|
+ <option name="totallyTimeSpent" value="227810000" />
|
801
|
</component>
|
802
|
</component>
|
802
|
<component name="ToolWindowManager">
|
803
|
<component name="ToolWindowManager">
|
803
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
804
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -1235,8 +1236,8 @@ |
|
@@ -1235,8 +1236,8 @@ |
1235
|
</entry>
|
1236
|
</entry>
|
1236
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
1237
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
1237
|
<provider selected="true" editor-type-id="text-editor">
|
1238
|
<provider selected="true" editor-type-id="text-editor">
|
1238
|
- <state relative-caret-position="306">
|
|
|
1239
|
- <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
|
1239
|
+ <state relative-caret-position="289">
|
|
|
1240
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
1240
|
</state>
|
1241
|
</state>
|
1241
|
</provider>
|
1242
|
</provider>
|
1242
|
</entry>
|
1243
|
</entry>
|