|
@@ -3,7 +3,7 @@ |
|
@@ -3,7 +3,7 @@ |
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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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
|
+ <change beforePath="$PROJECT_DIR$/application/home/controller/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/User.php" afterDir="false" />
|
7
|
</list>
|
7
|
</list>
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -29,8 +29,8 @@ |
|
@@ -29,8 +29,8 @@ |
29
|
<file leaf-file-name="authorization_view.html" pinned="false" current-in-tab="false">
|
29
|
<file leaf-file-name="authorization_view.html" pinned="false" current-in-tab="false">
|
30
|
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
|
30
|
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
|
31
|
<provider selected="true" editor-type-id="text-editor">
|
31
|
<provider selected="true" editor-type-id="text-editor">
|
32
|
- <state relative-caret-position="374">
|
|
|
33
|
- <caret line="67" column="65" selection-start-line="67" selection-start-column="65" selection-end-line="67" selection-end-column="65" />
|
32
|
+ <state relative-caret-position="238">
|
|
|
33
|
+ <caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
|
34
|
<folding>
|
34
|
<folding>
|
35
|
<element signature="n#style#0;n#html#0;n#!!top" />
|
35
|
<element signature="n#style#0;n#html#0;n#!!top" />
|
36
|
</folding>
|
36
|
</folding>
|
|
@@ -38,11 +38,20 @@ |
|
@@ -38,11 +38,20 @@ |
38
|
</provider>
|
38
|
</provider>
|
39
|
</entry>
|
39
|
</entry>
|
40
|
</file>
|
40
|
</file>
|
41
|
- <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
|
41
|
+ <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
|
42
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
42
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
43
|
<provider selected="true" editor-type-id="text-editor">
|
43
|
<provider selected="true" editor-type-id="text-editor">
|
44
|
- <state relative-caret-position="283">
|
|
|
45
|
- <caret line="154" column="33" selection-start-line="154" selection-start-column="20" selection-end-line="154" selection-end-column="33" />
|
44
|
+ <state relative-caret-position="198">
|
|
|
45
|
+ <caret line="143" column="11" selection-start-line="143" selection-start-column="11" selection-end-line="143" selection-end-column="11" />
|
|
|
46
|
+ </state>
|
|
|
47
|
+ </provider>
|
|
|
48
|
+ </entry>
|
|
|
49
|
+ </file>
|
|
|
50
|
+ <file leaf-file-name="WechatBase.php" pinned="false" current-in-tab="false">
|
|
|
51
|
+ <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
|
|
52
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
53
|
+ <state relative-caret-position="708">
|
|
|
54
|
+ <caret line="86" column="46" selection-start-line="86" selection-start-column="46" selection-end-line="86" selection-end-column="46" />
|
46
|
</state>
|
55
|
</state>
|
47
|
</provider>
|
56
|
</provider>
|
48
|
</entry>
|
57
|
</entry>
|
|
@@ -56,11 +65,29 @@ |
|
@@ -56,11 +65,29 @@ |
56
|
</provider>
|
65
|
</provider>
|
57
|
</entry>
|
66
|
</entry>
|
58
|
</file>
|
67
|
</file>
|
59
|
- <file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
|
68
|
+ <file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
|
60
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
69
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
61
|
<provider selected="true" editor-type-id="text-editor">
|
70
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
71
|
+ <state relative-caret-position="306">
|
|
|
72
|
+ <caret line="26" column="85" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="85" />
|
|
|
73
|
+ </state>
|
|
|
74
|
+ </provider>
|
|
|
75
|
+ </entry>
|
|
|
76
|
+ </file>
|
|
|
77
|
+ <file leaf-file-name="Jump.php" pinned="false" current-in-tab="false">
|
|
|
78
|
+ <entry file="file://$PROJECT_DIR$/thinkphp/library/traits/controller/Jump.php">
|
|
|
79
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
80
|
+ <state relative-caret-position="341">
|
|
|
81
|
+ <caret line="142" column="45" selection-start-line="142" selection-start-column="38" selection-end-line="142" selection-end-column="45" />
|
|
|
82
|
+ </state>
|
|
|
83
|
+ </provider>
|
|
|
84
|
+ </entry>
|
|
|
85
|
+ </file>
|
|
|
86
|
+ <file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
|
|
|
87
|
+ <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
|
|
|
88
|
+ <provider selected="true" editor-type-id="text-editor">
|
62
|
<state relative-caret-position="289">
|
89
|
<state relative-caret-position="289">
|
63
|
- <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
90
|
+ <caret line="279" column="63" selection-start-line="279" selection-start-column="56" selection-end-line="279" selection-end-column="63" />
|
64
|
</state>
|
91
|
</state>
|
65
|
</provider>
|
92
|
</provider>
|
66
|
</entry>
|
93
|
</entry>
|
|
@@ -83,15 +110,6 @@ |
|
@@ -83,15 +110,6 @@ |
83
|
</provider>
|
110
|
</provider>
|
84
|
</entry>
|
111
|
</entry>
|
85
|
</file>
|
112
|
</file>
|
86
|
- <file leaf-file-name="head.html" pinned="false" current-in-tab="false">
|
|
|
87
|
- <entry file="file://$PROJECT_DIR$/application/home/view/public/head.html">
|
|
|
88
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
89
|
- <state relative-caret-position="85">
|
|
|
90
|
- <caret line="5" column="76" selection-start-line="5" selection-start-column="76" selection-end-line="5" selection-end-column="76" />
|
|
|
91
|
- </state>
|
|
|
92
|
- </provider>
|
|
|
93
|
- </entry>
|
|
|
94
|
- </file>
|
|
|
95
|
</leaf>
|
113
|
</leaf>
|
96
|
</component>
|
114
|
</component>
|
97
|
<component name="FileTemplateManagerImpl">
|
115
|
<component name="FileTemplateManagerImpl">
|
|
@@ -118,8 +136,6 @@ |
|
@@ -118,8 +136,6 @@ |
118
|
<component name="IdeDocumentHistory">
|
136
|
<component name="IdeDocumentHistory">
|
119
|
<option name="CHANGED_PATHS">
|
137
|
<option name="CHANGED_PATHS">
|
120
|
<list>
|
138
|
<list>
|
121
|
- <option value="$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js" />
|
|
|
122
|
- <option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
|
|
|
123
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
139
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
124
|
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
|
140
|
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
|
125
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
|
141
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
|
|
@@ -165,10 +181,12 @@ |
|
@@ -165,10 +181,12 @@ |
165
|
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
|
181
|
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
|
166
|
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
|
182
|
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
|
167
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
183
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
168
|
- <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
|
|
|
169
|
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
|
184
|
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
|
170
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
185
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
171
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
186
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
|
|
187
|
+ <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
|
|
|
188
|
+ <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
|
|
|
189
|
+ <option value="$PROJECT_DIR$/application/home/controller/User.php" />
|
172
|
</list>
|
190
|
</list>
|
173
|
</option>
|
191
|
</option>
|
174
|
</component>
|
192
|
</component>
|
|
@@ -377,7 +395,7 @@ |
|
@@ -377,7 +395,7 @@ |
377
|
<component name="PropertiesComponent">
|
395
|
<component name="PropertiesComponent">
|
378
|
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
396
|
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
379
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
397
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
380
|
- <property name="last_opened_file_path" value="D:/phpStudy/WWW/bank" />
|
398
|
+ <property name="last_opened_file_path" value="D:/phpStudy/WWW/shengbao" />
|
381
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
399
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
382
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
400
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
383
|
<property name="settings.editor.selected.configurable" value="terminal" />
|
401
|
<property name="settings.editor.selected.configurable" value="terminal" />
|
|
@@ -431,7 +449,7 @@ |
|
@@ -431,7 +449,7 @@ |
431
|
<workItem from="1572223206994" duration="28857000" />
|
449
|
<workItem from="1572223206994" duration="28857000" />
|
432
|
<workItem from="1572309778506" duration="26117000" />
|
450
|
<workItem from="1572309778506" duration="26117000" />
|
433
|
<workItem from="1572395935540" duration="28313000" />
|
451
|
<workItem from="1572395935540" duration="28313000" />
|
434
|
- <workItem from="1572483209367" duration="11705000" />
|
452
|
+ <workItem from="1572483209367" duration="12597000" />
|
435
|
</task>
|
453
|
</task>
|
436
|
<task id="LOCAL-00001" summary="数据库配置">
|
454
|
<task id="LOCAL-00001" summary="数据库配置">
|
437
|
<created>1571972429395</created>
|
455
|
<created>1571972429395</created>
|
|
@@ -741,11 +759,25 @@ |
|
@@ -741,11 +759,25 @@ |
741
|
<option name="project" value="LOCAL" />
|
759
|
<option name="project" value="LOCAL" />
|
742
|
<updated>1572502485108</updated>
|
760
|
<updated>1572502485108</updated>
|
743
|
</task>
|
761
|
</task>
|
744
|
- <option name="localTasksCounter" value="45" />
|
762
|
+ <task id="LOCAL-00045" summary="调试授权登录">
|
|
|
763
|
+ <created>1572502565105</created>
|
|
|
764
|
+ <option name="number" value="00045" />
|
|
|
765
|
+ <option name="presentableId" value="LOCAL-00045" />
|
|
|
766
|
+ <option name="project" value="LOCAL" />
|
|
|
767
|
+ <updated>1572502565105</updated>
|
|
|
768
|
+ </task>
|
|
|
769
|
+ <task id="LOCAL-00046" summary="调试授权登录">
|
|
|
770
|
+ <created>1572503340201</created>
|
|
|
771
|
+ <option name="number" value="00046" />
|
|
|
772
|
+ <option name="presentableId" value="LOCAL-00046" />
|
|
|
773
|
+ <option name="project" value="LOCAL" />
|
|
|
774
|
+ <updated>1572503340201</updated>
|
|
|
775
|
+ </task>
|
|
|
776
|
+ <option name="localTasksCounter" value="47" />
|
745
|
<servers />
|
777
|
<servers />
|
746
|
</component>
|
778
|
</component>
|
747
|
<component name="TimeTrackingManager">
|
779
|
<component name="TimeTrackingManager">
|
748
|
- <option name="totallyTimeSpent" value="225243000" />
|
780
|
+ <option name="totallyTimeSpent" value="226135000" />
|
749
|
</component>
|
781
|
</component>
|
750
|
<component name="ToolWindowManager">
|
782
|
<component name="ToolWindowManager">
|
751
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
783
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -818,25 +850,6 @@ |
|
@@ -818,25 +850,6 @@ |
818
|
<option name="LAST_COMMIT_MESSAGE" value="调试授权登录" />
|
850
|
<option name="LAST_COMMIT_MESSAGE" value="调试授权登录" />
|
819
|
</component>
|
851
|
</component>
|
820
|
<component name="editorHistoryManager">
|
852
|
<component name="editorHistoryManager">
|
821
|
- <entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/index.html">
|
|
|
822
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
823
|
- <state relative-caret-position="510">
|
|
|
824
|
- <caret line="30" column="33" selection-start-line="24" selection-start-column="24" selection-end-line="30" selection-end-column="33" />
|
|
|
825
|
- </state>
|
|
|
826
|
- </provider>
|
|
|
827
|
- </entry>
|
|
|
828
|
- <entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
|
|
|
829
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
830
|
- <state relative-caret-position="-306" />
|
|
|
831
|
- </provider>
|
|
|
832
|
- </entry>
|
|
|
833
|
- <entry file="file://$PROJECT_DIR$/application/admin/model/GoodsAudit.php">
|
|
|
834
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
835
|
- <state relative-caret-position="119">
|
|
|
836
|
- <caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
|
|
|
837
|
- </state>
|
|
|
838
|
- </provider>
|
|
|
839
|
- </entry>
|
|
|
840
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods_audit.js">
|
853
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods_audit.js">
|
841
|
<provider selected="true" editor-type-id="text-editor">
|
854
|
<provider selected="true" editor-type-id="text-editor">
|
842
|
<state relative-caret-position="408">
|
855
|
<state relative-caret-position="408">
|
|
@@ -1120,13 +1133,6 @@ |
|
@@ -1120,13 +1133,6 @@ |
1120
|
</state>
|
1133
|
</state>
|
1121
|
</provider>
|
1134
|
</provider>
|
1122
|
</entry>
|
1135
|
</entry>
|
1123
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
1124
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1125
|
- <state relative-caret-position="283">
|
|
|
1126
|
- <caret line="154" column="33" selection-start-line="154" selection-start-column="20" selection-end-line="154" selection-end-column="33" />
|
|
|
1127
|
- </state>
|
|
|
1128
|
- </provider>
|
|
|
1129
|
- </entry>
|
|
|
1130
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/head.html">
|
1136
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/head.html">
|
1131
|
<provider selected="true" editor-type-id="text-editor">
|
1137
|
<provider selected="true" editor-type-id="text-editor">
|
1132
|
<state relative-caret-position="85">
|
1138
|
<state relative-caret-position="85">
|
|
@@ -1148,41 +1154,69 @@ |
|
@@ -1148,41 +1154,69 @@ |
1148
|
</state>
|
1154
|
</state>
|
1149
|
</provider>
|
1155
|
</provider>
|
1150
|
</entry>
|
1156
|
</entry>
|
|
|
1157
|
+ <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
|
|
1158
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1159
|
+ <state relative-caret-position="357">
|
|
|
1160
|
+ <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
|
|
|
1161
|
+ </state>
|
|
|
1162
|
+ </provider>
|
|
|
1163
|
+ </entry>
|
1151
|
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
|
1164
|
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
|
1152
|
<provider selected="true" editor-type-id="text-editor">
|
1165
|
<provider selected="true" editor-type-id="text-editor">
|
1153
|
<state relative-caret-position="289">
|
1166
|
<state relative-caret-position="289">
|
1154
|
- <caret line="279" column="71" selection-start-line="279" selection-start-column="66" selection-end-line="279" selection-end-column="71" />
|
1167
|
+ <caret line="279" column="63" selection-start-line="279" selection-start-column="56" selection-end-line="279" selection-end-column="63" />
|
|
|
1168
|
+ </state>
|
|
|
1169
|
+ </provider>
|
|
|
1170
|
+ </entry>
|
|
|
1171
|
+ <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_2.php">
|
|
|
1172
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1173
|
+ <state relative-caret-position="204">
|
|
|
1174
|
+ <caret line="505" column="28" lean-forward="true" selection-start-line="505" selection-start-column="28" selection-end-line="505" selection-end-column="28" />
|
|
|
1175
|
+ </state>
|
|
|
1176
|
+ </provider>
|
|
|
1177
|
+ </entry>
|
|
|
1178
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
1179
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1180
|
+ <state relative-caret-position="334">
|
|
|
1181
|
+ <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
1182
|
+ </state>
|
|
|
1183
|
+ </provider>
|
|
|
1184
|
+ </entry>
|
|
|
1185
|
+ <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
|
|
1186
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1187
|
+ <state relative-caret-position="708">
|
|
|
1188
|
+ <caret line="86" column="46" selection-start-line="86" selection-start-column="46" selection-end-line="86" selection-end-column="46" />
|
1155
|
</state>
|
1189
|
</state>
|
1156
|
</provider>
|
1190
|
</provider>
|
1157
|
</entry>
|
1191
|
</entry>
|
1158
|
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
|
1192
|
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
|
1159
|
<provider selected="true" editor-type-id="text-editor">
|
1193
|
<provider selected="true" editor-type-id="text-editor">
|
1160
|
- <state relative-caret-position="374">
|
|
|
1161
|
- <caret line="67" column="65" selection-start-line="67" selection-start-column="65" selection-end-line="67" selection-end-column="65" />
|
1194
|
+ <state relative-caret-position="238">
|
|
|
1195
|
+ <caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
|
1162
|
<folding>
|
1196
|
<folding>
|
1163
|
<element signature="n#style#0;n#html#0;n#!!top" />
|
1197
|
<element signature="n#style#0;n#html#0;n#!!top" />
|
1164
|
</folding>
|
1198
|
</folding>
|
1165
|
</state>
|
1199
|
</state>
|
1166
|
</provider>
|
1200
|
</provider>
|
1167
|
</entry>
|
1201
|
</entry>
|
1168
|
- <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
1202
|
+ <entry file="file://$PROJECT_DIR$/thinkphp/library/traits/controller/Jump.php">
|
1169
|
<provider selected="true" editor-type-id="text-editor">
|
1203
|
<provider selected="true" editor-type-id="text-editor">
|
1170
|
- <state relative-caret-position="357">
|
|
|
1171
|
- <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
|
1204
|
+ <state relative-caret-position="341">
|
|
|
1205
|
+ <caret line="142" column="45" selection-start-line="142" selection-start-column="38" selection-end-line="142" selection-end-column="45" />
|
1172
|
</state>
|
1206
|
</state>
|
1173
|
</provider>
|
1207
|
</provider>
|
1174
|
</entry>
|
1208
|
</entry>
|
1175
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
1209
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
1176
|
<provider selected="true" editor-type-id="text-editor">
|
1210
|
<provider selected="true" editor-type-id="text-editor">
|
1177
|
- <state relative-caret-position="334">
|
|
|
1178
|
- <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
1211
|
+ <state relative-caret-position="306">
|
|
|
1212
|
+ <caret line="26" column="85" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="85" />
|
1179
|
</state>
|
1213
|
</state>
|
1180
|
</provider>
|
1214
|
</provider>
|
1181
|
</entry>
|
1215
|
</entry>
|
1182
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
1216
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
1183
|
<provider selected="true" editor-type-id="text-editor">
|
1217
|
<provider selected="true" editor-type-id="text-editor">
|
1184
|
- <state relative-caret-position="289">
|
|
|
1185
|
- <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
1218
|
+ <state relative-caret-position="198">
|
|
|
1219
|
+ <caret line="143" column="11" selection-start-line="143" selection-start-column="11" selection-end-line="143" selection-end-column="11" />
|
1186
|
</state>
|
1220
|
</state>
|
1187
|
</provider>
|
1221
|
</provider>
|
1188
|
</entry>
|
1222
|
</entry>
|