commit:同步1.4版本

This commit is contained in:
Jerry
2021-02-03 21:40:27 +08:00
parent 461b7a303b
commit 3a062ad619
290 changed files with 6973 additions and 4845 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8e833a26-fdef-45f6-a8c9-69c22611e94c" name="Default Changelist" comment="" />
<list default="true" id="be2ffe74-d2e3-4651-9b2b-9383f02a6ecc" 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="1mYqHJvsDmC9tqOlQivdAjKUGzi" />
<component name="ProjectId" id="1nyJS1Tf4x77OAvHc5z1TqP813w" />
<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.CourseClassApplication">
<component name="RunManager" selected="Spring Boot.StatsApplication">
<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,12 +83,12 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8e833a26-fdef-45f6-a8c9-69c22611e94c" name="Default Changelist" comment="" />
<created>1609680782670</created>
<changelist id="be2ffe74-d2e3-4651-9b2b-9383f02a6ecc" name="Default Changelist" comment="" />
<created>1612356392884</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1609680782670</updated>
<workItem from="1609680784203" duration="256000" />
<updated>1612356392884</updated>
<workItem from="1612356394589" duration="241000" />
</task>
<servers />
</component>