|
@@ -4,7 +4,6 @@
|
|
<list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" name="Default Changelist" comment="">
|
|
<list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" 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/admin/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Login.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/application/admin/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Login.php" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/application/admin/controller/Sms.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Sms.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" />
|
|
@@ -97,7 +96,7 @@
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../yyyfs" />
|
|
|
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
<property name="node.js.detected.package.eslint" value="true" />
|
|
<property name="node.js.detected.package.eslint" value="true" />
|
|
<property name="node.js.detected.package.tslint" value="true" />
|
|
<property name="node.js.detected.package.tslint" value="true" />
|
|
<property name="node.js.path.for.package.eslint" value="project" />
|
|
<property name="node.js.path.for.package.eslint" value="project" />
|
|
@@ -162,7 +161,13 @@
|
|
<workItem from="1663115673803" duration="1190000" />
|
|
<workItem from="1663115673803" duration="1190000" />
|
|
<workItem from="1663216924790" duration="1225000" />
|
|
<workItem from="1663216924790" duration="1225000" />
|
|
<workItem from="1663289319358" duration="4076000" />
|
|
<workItem from="1663289319358" duration="4076000" />
|
|
- <workItem from="1663374116062" duration="627000" />
|
|
|
|
|
|
+ <workItem from="1663374116062" duration="1228000" />
|
|
|
|
+ <workItem from="1663548946176" duration="1856000" />
|
|
|
|
+ <workItem from="1663721096756" duration="1792000" />
|
|
|
|
+ <workItem from="1663807605888" duration="1217000" />
|
|
|
|
+ <workItem from="1663893231881" duration="1439000" />
|
|
|
|
+ <workItem from="1664001110862" duration="8000" />
|
|
|
|
+ <workItem from="1665191245089" duration="927000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
@@ -186,10 +191,10 @@
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
</state>
|
|
</state>
|
|
<state x="1171" y="588" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1662342967622" />
|
|
<state x="1171" y="588" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1662342967622" />
|
|
- <state x="792" y="654" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1663220069228">
|
|
|
|
|
|
+ <state x="792" y="654" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1665191294158">
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
</state>
|
|
</state>
|
|
- <state x="792" y="654" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1663220069228" />
|
|
|
|
|
|
+ <state x="792" y="654" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1665191294158" />
|
|
<state x="1076" y="479" width="728" height="490" key="find.popup" timestamp="1662343074011">
|
|
<state x="1076" y="479" width="728" height="490" key="find.popup" timestamp="1662343074011">
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
</state>
|
|
</state>
|