commit:同步1.3版本

This commit is contained in:
Jerry
2021-01-03 22:29:02 +08:00
parent ef316438da
commit 25023e29b5
706 changed files with 23404 additions and 14179 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="6f0fe731-8106-4240-a91e-760ea71139d2" name="Default Changelist" comment="" />
<list default="true" id="ba07472a-9cbf-4f92-ba42-dd5d375307a7" name="Default Changelist" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -13,7 +13,7 @@
<component name="ProjectCodeStyleSettingsMigration">
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1lpkKsxvoxNJhAIdawJWNNMoTRh" />
<component name="ProjectId" id="1mYpq9QMeDr2nXWekQ1bdbUatK7" />
<component name="ProjectViewState">
<option name="abbreviatePackageNames" value="true" />
<option name="autoscrollFromSource" value="true" />
@@ -36,7 +36,7 @@
<recent name="$PROJECT_DIR$/zz-resource/db-scripts" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.UpmsApplication">
<component name="RunManager" selected="Spring Boot.CourseClassApplication">
<configuration name="AdminMonitorApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="admin-monitor" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.orange.demo.adminmonitor.AdminMonitorApplication" />
@@ -83,16 +83,22 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="6f0fe731-8106-4240-a91e-760ea71139d2" name="Default Changelist" comment="" />
<created>1608301359786</created>
<changelist id="ba07472a-9cbf-4f92-ba42-dd5d375307a7" name="Default Changelist" comment="" />
<created>1609680566881</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1608301359786</updated>
<workItem from="1608301361336" duration="175000" />
<updated>1609680566881</updated>
<workItem from="1609680568449" duration="164000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="WindowStateProjectService">
<state x="385" y="196" width="670" height="676" key="search.everywhere.popup" timestamp="1609680683739">
<screen x="0" y="0" width="1440" height="900" />
</state>
<state x="385" y="196" width="670" height="676" key="search.everywhere.popup/0.0.1440.900@0.0.1440.900" timestamp="1609680683739" />
</component>
</project>