|
@@ -6,11 +6,10 @@
|
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="9df7b838-09db-466a-bed4-3e1ac8c3624d" name="变更" comment="commit">
|
|
<list default="true" id="9df7b838-09db-466a-bed4-3e1ac8c3624d" name="变更" comment="commit">
|
|
|
<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$/app/admin/controller/auction/Auction.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/auction/Auction.php" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/controller/auction/AuctionProduct.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/auction/AuctionProduct.php" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/model/auction/AuctionProduct.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/model/auction/AuctionProduct.php" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/api/controller/auction/AuctionController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/auction/AuctionController.php" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/models/auction/AuctionOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/auction/AuctionOrder.php" afterDir="false" />
|
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/admin/view/auction/auction/fz.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction/fz.php" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/admin/view/auction/auction/product_create.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction/product_create.php" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/admin/view/auction/auction_product/create.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction_product/create.php" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/admin/view/auction/auction_product/fz.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction_product/fz.php" 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" />
|
|
@@ -145,7 +144,7 @@
|
|
|
<workItem from="1657240542957" duration="117000" />
|
|
<workItem from="1657240542957" duration="117000" />
|
|
|
<workItem from="1657247426337" duration="7039000" />
|
|
<workItem from="1657247426337" duration="7039000" />
|
|
|
<workItem from="1657326818073" duration="7198000" />
|
|
<workItem from="1657326818073" duration="7198000" />
|
|
|
- <workItem from="1657500150633" duration="6917000" />
|
|
|
|
|
|
|
+ <workItem from="1657500150633" duration="9030000" />
|
|
|
</task>
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="commit">
|
|
<task id="LOCAL-00001" summary="commit">
|
|
|
<created>1655962607195</created>
|
|
<created>1655962607195</created>
|
|
@@ -210,7 +209,14 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1657505307060</updated>
|
|
<updated>1657505307060</updated>
|
|
|
</task>
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="10" />
|
|
|
|
|
|
|
+ <task id="LOCAL-00010" summary="commit">
|
|
|
|
|
+ <created>1657507871569</created>
|
|
|
|
|
+ <option name="number" value="00010" />
|
|
|
|
|
+ <option name="presentableId" value="LOCAL-00010" />
|
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
|
+ <updated>1657507871569</updated>
|
|
|
|
|
+ </task>
|
|
|
|
|
+ <option name="localTasksCounter" value="11" />
|
|
|
<servers />
|
|
<servers />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|