|
@@ -2,6 +2,7 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -18,8 +19,8 @@
|
|
<file pinned="false" current-in-tab="true">
|
|
<file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="226">
|
|
|
|
- <caret line="443" column="78" selection-start-line="443" selection-start-column="78" selection-end-line="443" selection-end-column="78" />
|
|
|
|
|
|
+ <state relative-caret-position="253">
|
|
|
|
+ <caret line="404" column="20" selection-start-line="404" selection-start-column="20" selection-end-line="404" selection-end-column="20" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -42,8 +43,8 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="903">
|
|
|
|
- <caret line="43" column="52" selection-start-line="43" selection-start-column="52" selection-end-line="43" selection-end-column="52" />
|
|
|
|
|
|
+ <state relative-caret-position="267">
|
|
|
|
+ <caret line="28" column="26" lean-forward="true" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
@@ -55,8 +56,8 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="426">
|
|
|
|
- <caret line="214" column="71" selection-start-line="214" selection-start-column="67" selection-end-line="214" selection-end-column="71" />
|
|
|
|
|
|
+ <state relative-caret-position="227">
|
|
|
|
+ <caret line="174" column="20" selection-start-line="174" selection-start-column="20" selection-end-line="174" selection-end-column="20" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -67,8 +68,8 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="170">
|
|
|
|
- <caret line="84" column="48" lean-forward="true" selection-start-line="84" selection-start-column="48" selection-end-line="84" selection-end-column="48" />
|
|
|
|
|
|
+ <state relative-caret-position="533">
|
|
|
|
+ <caret line="84" column="49" selection-start-line="84" selection-start-column="49" selection-end-line="84" selection-end-column="49" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -77,6 +78,30 @@
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="312">
|
|
|
|
+ <caret line="98" column="47" selection-start-line="98" selection-start-column="47" selection-end-line="98" selection-end-column="47" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="539">
|
|
|
|
+ <caret line="289" column="39" lean-forward="true" selection-start-line="289" selection-start-column="39" selection-end-line="289" selection-end-column="39" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="450">
|
|
<state relative-caret-position="450">
|
|
@@ -427,7 +452,7 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="479503000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="479540000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -690,8 +715,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="508">
|
|
|
|
- <caret line="289" column="39" selection-start-line="289" selection-start-column="39" selection-end-line="289" selection-end-column="39" />
|
|
|
|
|
|
+ <state relative-caret-position="539">
|
|
|
|
+ <caret line="289" column="39" lean-forward="true" selection-start-line="289" selection-start-column="39" selection-end-line="289" selection-end-column="39" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#127#148#0#PHP" expanded="true" />
|
|
<element signature="e#127#148#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -706,8 +731,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="903">
|
|
|
|
- <caret line="43" column="52" selection-start-line="43" selection-start-column="52" selection-end-line="43" selection-end-column="52" />
|
|
|
|
|
|
+ <state relative-caret-position="267">
|
|
|
|
+ <caret line="28" column="26" lean-forward="true" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
@@ -758,8 +783,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="137">
|
|
|
|
- <caret line="99" column="49" lean-forward="true" selection-start-line="99" selection-start-column="49" selection-end-line="99" selection-end-column="49" />
|
|
|
|
|
|
+ <state relative-caret-position="312">
|
|
|
|
+ <caret line="98" column="47" selection-start-line="98" selection-start-column="47" selection-end-line="98" selection-end-column="47" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -785,8 +810,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="426">
|
|
|
|
- <caret line="214" column="71" selection-start-line="214" selection-start-column="67" selection-end-line="214" selection-end-column="71" />
|
|
|
|
|
|
+ <state relative-caret-position="227">
|
|
|
|
+ <caret line="174" column="20" selection-start-line="174" selection-start-column="20" selection-end-line="174" selection-end-column="20" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -795,8 +820,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="170">
|
|
|
|
- <caret line="84" column="48" lean-forward="true" selection-start-line="84" selection-start-column="48" selection-end-line="84" selection-end-column="48" />
|
|
|
|
|
|
+ <state relative-caret-position="533">
|
|
|
|
+ <caret line="84" column="49" selection-start-line="84" selection-start-column="49" selection-end-line="84" selection-end-column="49" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -805,8 +830,8 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="226">
|
|
|
|
- <caret line="443" column="78" selection-start-line="443" selection-start-column="78" selection-end-line="443" selection-end-column="78" />
|
|
|
|
|
|
+ <state relative-caret-position="253">
|
|
|
|
+ <caret line="404" column="20" selection-start-line="404" selection-start-column="20" selection-end-line="404" selection-end-column="20" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|