|
@@ -3,8 +3,7 @@
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/public/static/admin.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/static/admin.js" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -150,13 +149,6 @@
|
|
<property name="two.files.diff.last.used.folder" value="$PROJECT_DIR$" />
|
|
<property name="two.files.diff.last.used.folder" value="$PROJECT_DIR$" />
|
|
</component>
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<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">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<recent name="D:\zs\gaoyixia\public\static" />
|
|
<recent name="D:\zs\gaoyixia\public\static" />
|
|
<recent name="D:\zs\gaoyixia\application\common\service" />
|
|
<recent name="D:\zs\gaoyixia\application\common\service" />
|
|
@@ -164,6 +156,13 @@
|
|
<recent name="D:\zs\gaoyixia\application\operate\view" />
|
|
<recent name="D:\zs\gaoyixia\application\operate\view" />
|
|
<recent name="D:\zs\gaoyixia\application\operate\controller" />
|
|
<recent name="D:\zs\gaoyixia\application\operate\controller" />
|
|
</key>
|
|
</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>
|
|
<component name="SvnConfiguration">
|
|
<component name="SvnConfiguration">
|
|
<configuration />
|
|
<configuration />
|
|
@@ -383,7 +382,7 @@
|
|
<workItem from="1690246325106" duration="23791000" />
|
|
<workItem from="1690246325106" duration="23791000" />
|
|
<workItem from="1690332708631" duration="20337000" />
|
|
<workItem from="1690332708631" duration="20337000" />
|
|
<workItem from="1690419501541" duration="21049000" />
|
|
<workItem from="1690419501541" duration="21049000" />
|
|
- <workItem from="1690505259271" duration="6380000" />
|
|
|
|
|
|
+ <workItem from="1690505259271" duration="6642000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|