From 04a5f6fad54237aca87c2ed278bb2bfcc9ca74fd Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 08 Aug 2023 15:17:05 +0800
Subject: [PATCH] 丢失配置文件补回
---
.idea/workspace.xml | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4476010..62b520f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,14 +11,13 @@
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="BRANCH:main" type="e8cecc67:BranchNodeDescriptor" />
+ <item name="BRANCH:update-v" type="e8cecc67:BranchNodeDescriptor" />
</path>
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="208daac0-1abd-465d-abf2-6a0414be019b" name="默认的" comment="配置提交">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -121,6 +120,7 @@
<recent_temporary>
<list>
<item itemvalue="Application.Hex" />
+ <item itemvalue="Application.Hex" />
</list>
</recent_temporary>
</component>
@@ -192,6 +192,7 @@
<workItem from="1687772319116" duration="68000" />
<workItem from="1687846557234" duration="1264000" />
<workItem from="1687851016900" duration="5366000" />
+ <workItem from="1691477919332" duration="708000" />
</task>
<task id="LOCAL-00001" summary="默认的">
<created>1676691639632</created>
@@ -301,7 +302,7 @@
<entry key="branch">
<value>
<list>
- <option value="main" />
+ <option value="update-v" />
</list>
</value>
</entry>
@@ -371,22 +372,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="387" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1687856361203" />
- <state width="0" height="0" key="GridCell.Tab.2.bottom" timestamp="1687856252285">
+ <state x="184" y="86" key="MergeDialog" timestamp="1691477993456">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="0" height="0" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1687856252285" />
- <state width="0" height="0" key="GridCell.Tab.2.center" timestamp="1687856252285">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state width="0" height="0" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1687856252285" />
- <state width="0" height="0" key="GridCell.Tab.2.left" timestamp="1687856252285">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state width="0" height="0" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1687856252285" />
- <state width="0" height="0" key="GridCell.Tab.2.right" timestamp="1687856252285">
- <screen x="0" y="0" width="1920" height="1040" />
- </state>
- <state width="0" height="0" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1687856252285" />
+ <state x="184" y="86" key="MergeDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1691477993456" />
<state x="644" y="221" key="RollbackChangesDialog" timestamp="1686904469155">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -403,6 +392,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="661" y="252" width="866" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1687852785509" />
+ <state x="720" y="232" key="git4idea.branch.GitSmartOperationDialog" timestamp="1691478017364">
+ <screen x="0" y="0" width="1920" height="1040" />
+ </state>
+ <state x="720" y="232" key="git4idea.branch.GitSmartOperationDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1691478017364" />
<state x="643" y="306" key="git4idea.merge.GitPullDialog" timestamp="1687846658305">
<screen x="0" y="0" width="1920" height="1040" />
</state>
--
Gitblit v1.9.3