|
@@ -2,8 +2,12 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
|
+ <change afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index_search.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/common/service/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/Activity.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -138,7 +142,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$/../ddsc" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/application/synth/view" />
|
|
|
<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" />
|
|
@@ -149,19 +153,19 @@
|
|
|
<property name="two.files.diff.last.used.folder" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
- <key name="CopyFile.RECENT_KEYS">
|
|
|
- <recent name="D:\zs\gaoyixia\application\nutrition\view" />
|
|
|
- <recent name="D:\zs\gaoyixia\application\nutrition\controller" />
|
|
|
- <recent name="D:\zs\gaoyixia\application\operate\controller" />
|
|
|
- <recent name="D:\zs\gaoyixia\application\operate\view" />
|
|
|
- <recent name="D:\zs\gaoyixia\application\common\model" />
|
|
|
- </key>
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
|
<recent name="D:\zs\gaoyixia\public\wx_cert" />
|
|
|
<recent name="D:\zs\gaoyixia\public\a" />
|
|
|
<recent name="D:\zs\gaoyixia\public" />
|
|
|
<recent name="D:\zs\gaoyixia\application\api\controller" />
|
|
|
</key>
|
|
|
+ <key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="D:\zs\gaoyixia\application\synth\view" />
|
|
|
+ <recent name="D:\zs\gaoyixia\application\synth\controller" />
|
|
|
+ <recent name="D:\zs\gaoyixia\application\nutrition\view" />
|
|
|
+ <recent name="D:\zs\gaoyixia\application\nutrition\controller" />
|
|
|
+ <recent name="D:\zs\gaoyixia\application\operate\controller" />
|
|
|
+ </key>
|
|
|
</component>
|
|
|
<component name="SvnConfiguration">
|
|
|
<configuration />
|
|
@@ -326,7 +330,8 @@
|
|
|
<workItem from="1684457633587" duration="21568000" />
|
|
|
<workItem from="1684543423796" duration="10653000" />
|
|
|
<workItem from="1684716593546" duration="15730000" />
|
|
|
- <workItem from="1684743465298" duration="4782000" />
|
|
|
+ <workItem from="1684743465298" duration="6526000" />
|
|
|
+ <workItem from="1684802887863" duration="1788000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -476,10 +481,10 @@
|
|
|
<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="1681796091672" />
|
|
|
- <state x="535" y="293" key="com.intellij.ide.util.TipDialog" timestamp="1684743466065">
|
|
|
+ <state x="535" y="293" key="com.intellij.ide.util.TipDialog" timestamp="1684803144324">
|
|
|
<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="1684743466065" />
|
|
|
+ <state x="535" y="293" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1684803144324" />
|
|
|
<state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1683268554421">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|