|
@@ -3,7 +3,6 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" 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$/application/api/controller/Base.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Base.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -157,7 +156,7 @@
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../crmeb_pro" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../beauti-nof" />
|
|
|
<property name="node.js.detected.package.eslint" value="true" />
|
|
|
<property name="node.js.detected.package.tslint" value="true" />
|
|
|
<property name="node.js.path.for.package.eslint" value="project" />
|
|
@@ -168,13 +167,6 @@
|
|
|
<property name="two.files.diff.last.used.folder" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
- <key name="MoveFile.RECENT_KEYS">
|
|
|
- <recent name="D:\zs\gaoyixia\public" />
|
|
|
- <recent name="D:\zs\gaoyixia\public\static" />
|
|
|
- <recent name="D:\zs\gaoyixia\public\wx_cert" />
|
|
|
- <recent name="D:\zs\gaoyixia\public\a" />
|
|
|
- <recent name="D:\zs\gaoyixia\application\api\controller" />
|
|
|
- </key>
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
<recent name="D:\zs\gaoyixia\application\order\view" />
|
|
|
<recent name="D:\zs\gaoyixia\application\order\controller" />
|
|
@@ -182,6 +174,13 @@
|
|
|
<recent name="D:\zs\gaoyixia\application\common\model" />
|
|
|
<recent name="D:\zs\gaoyixia\application\mall\view\goods_cate" />
|
|
|
</key>
|
|
|
+ <key name="MoveFile.RECENT_KEYS">
|
|
|
+ <recent name="D:\zs\gaoyixia\public" />
|
|
|
+ <recent name="D:\zs\gaoyixia\public\static" />
|
|
|
+ <recent name="D:\zs\gaoyixia\public\wx_cert" />
|
|
|
+ <recent name="D:\zs\gaoyixia\public\a" />
|
|
|
+ <recent name="D:\zs\gaoyixia\application\api\controller" />
|
|
|
+ </key>
|
|
|
</component>
|
|
|
<component name="SvnConfiguration">
|
|
|
<configuration />
|
|
@@ -441,9 +440,8 @@
|
|
|
<workItem from="1694565971470" duration="21552000" />
|
|
|
<workItem from="1694652561038" duration="24839000" />
|
|
|
<workItem from="1694739473903" duration="20371000" />
|
|
|
- <workItem from="1694997975324" duration="5574000" />
|
|
|
- <workItem from="1695085328694" duration="21844000" />
|
|
|
- <workItem from="1695603648860" duration="22956000" />
|
|
|
+ <workItem from="1694997975324" duration="2346000" />
|
|
|
+ <workItem from="1695350550757" duration="6033000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -573,34 +571,32 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1245" y="552" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1695006721171" />
|
|
|
- <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1695607260540">
|
|
|
+ <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1694673363941">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1695607260540" />
|
|
|
- <state x="360" y="413" width="1942" height="1088" key="DiffContextDialog" timestamp="1695633841041">
|
|
|
+ <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1694673363941" />
|
|
|
+ <state x="360" y="413" width="1942" height="1088" key="DiffContextDialog" timestamp="1694419923508">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="360" y="413" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1695633841041" />
|
|
|
- <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1695632134462">
|
|
|
- <screen x="0" y="0" width="2560" height="1400" />
|
|
|
- </state>
|
|
|
- <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1695632134462" />
|
|
|
- <state x="1047" y="451" key="MultipleFileMergeDialog" timestamp="1695603912079">
|
|
|
- <screen x="0" y="0" width="2560" height="1400" />
|
|
|
+ <state x="360" y="413" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1694419923508" />
|
|
|
+ <state x="1215" y="438" key="FileChooserDialogImpl" timestamp="1695710379583">
|
|
|
+ <screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
- <state x="1047" y="451" key="MultipleFileMergeDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1695603912079" />
|
|
|
+ <state x="1215" y="438" key="FileChooserDialogImpl/0.0.2194.1194@0.0.2194.1194" timestamp="1695710379583" />
|
|
|
+ <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1694766099303" />
|
|
|
<state width="498" height="446" key="SwitcherDM" timestamp="1693380266237">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state width="498" height="446" key="SwitcherDM/0.0.2560.1400@0.0.2560.1400" timestamp="1693380266237" />
|
|
|
- <state x="535" y="293" key="com.intellij.ide.util.TipDialog" timestamp="1695085329450">
|
|
|
+ <state x="535" y="293" key="com.intellij.ide.util.TipDialog" timestamp="1694739530341">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="535" y="293" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1695085329450" />
|
|
|
- <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1695603810030">
|
|
|
- <screen x="0" y="0" width="2560" height="1400" />
|
|
|
+ <state x="535" y="293" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1694739530341" />
|
|
|
+ <state x="999" y="516" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1695720391734">
|
|
|
+ <screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
- <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1695603810030" />
|
|
|
+ <state x="999" y="516" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2194.1194@0.0.2194.1194" timestamp="1695720391734" />
|
|
|
+ <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1687246001889" />
|
|
|
<state x="686" y="156" width="1407" height="1056" key="find.popup" timestamp="1694499272246">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
@@ -663,6 +659,15 @@
|
|
|
</properties>
|
|
|
<option name="timeStamp" value="11" />
|
|
|
</line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="php-line-method">
|
|
|
+ <url>file://$PROJECT_DIR$/application/api/controller/Qc.php</url>
|
|
|
+ <line>27</line>
|
|
|
+ <properties>
|
|
|
+ <option name="className" value="\app\api\controller\Qc" />
|
|
|
+ <option name="methodName" value="topSearchSet" />
|
|
|
+ </properties>
|
|
|
+ <option name="timeStamp" value="12" />
|
|
|
+ </line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|