Commit 71f4bab0 authored by 赵建伟's avatar 赵建伟

update codes

parent 511b06ed
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="d5f48aa6-efd5-46e7-8592-d3409cf68c59" name="Default Changelist" comment="add database name pm" />
=======
<list default="true" id="d5f48aa6-efd5-46e7-8592-d3409cf68c59" name="Default Changelist" comment="" />
>>>>>>> 9913a05f6f5dd64cb019c7c02bf4851ed2fce190
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CodeStyleSettingsInfer">
<option name="done" value="true" />
</component>
<component name="ComposerSettings">
<execution>
<executable />
</execution>
</component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<select />
</component>
<component name="FavoritesManager">
<favorites_list name="bi-report" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectCodeStyleSettingsMigration">
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1d1NRg7HlRiWDUuE2xo1ruXomlE" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="ignore_missing_gitignore" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="RunManager">
<configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false">
<setting name="replType" value="NREPL" />
<setting name="execution" value="LEININGEN" />
<setting name="jvmArgs" value="" />
<setting name="parameters" value="" />
<setting name="workingDir" value="" />
<setting name="profiles" value="" />
<setting name="aliases" value="" />
<setting name="fixLineNumbers" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="ClojureREPL" factoryName="Remote" activateToolWindowBeforeRun="false">
<setting name="host" value="" />
<setting name="port" value="0" />
<setting name="replType" value="SOCKET" />
<setting name="configType" value="SPECIFY" />
<setting name="fixLineNumbers" value="false" />
<method v="2" />
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task id="LOCAL-00001" summary="add database name pm">
<created>1590736919279</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1590736919279</updated>
</task>
<task active="true" id="Default" summary="Default task">
<changelist id="d5f48aa6-efd5-46e7-8592-d3409cf68c59" name="Default Changelist" comment="" />
<created>1591588632171</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1591588632171</updated>
<workItem from="1591588633866" duration="2409000" />
<workItem from="1591668557485" duration="1164000" />
<workItem from="1591757105976" duration="605000" />
<workItem from="1591843790575" duration="598000" />
<<<<<<< HEAD
<workItem from="1592568360803" duration="5142000" />
</task>
<option name="localTasksCounter" value="2" />
=======
<workItem from="1592568360803" duration="8422000" />
<workItem from="1592812785070" duration="21000" />
</task>
<task id="LOCAL-00002" summary="add deploy shell">
<created>1592810237164</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1592810237166</updated>
</task>
<task id="LOCAL-00003" summary="update codes">
<created>1592811752618</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1592811752618</updated>
</task>
<option name="localTasksCounter" value="4" />
>>>>>>> 9913a05f6f5dd64cb019c7c02bf4851ed2fce190
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="add database name pm" />
<<<<<<< HEAD
<option name="LAST_COMMIT_MESSAGE" value="add database name pm" />
</component>
<component name="WindowStateProjectService">
<state x="554" y="197" key="CommitChangelistDialog2" timestamp="1592797495165">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592797495165" />
<state x="2306" y="1378" key="CommitChangelistDialog2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1590736919071" />
<state x="560" y="331" key="Vcs.Push.Dialog.v2" timestamp="1592809150983">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592809150983" />
<state x="2312" y="1515" key="Vcs.Push.Dialog.v2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1590736921013" />
=======
<MESSAGE value="add deploy shell" />
<MESSAGE value="update codes" />
<option name="LAST_COMMIT_MESSAGE" value="update codes" />
</component>
<component name="WindowStateProjectService">
<state x="554" y="197" key="CommitChangelistDialog2" timestamp="1592811752437">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592811752437" />
<state x="2306" y="1378" key="CommitChangelistDialog2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1590736919071" />
<state x="560" y="331" key="Vcs.Push.Dialog.v2" timestamp="1592811754411">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592811754411" />
<state x="2312" y="1515" key="Vcs.Push.Dialog.v2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1590736921013" />
<state x="715" y="306" key="git4idea.branch.GitSmartOperationDialog" timestamp="1592812682806">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="715" y="306" key="git4idea.branch.GitSmartOperationDialog/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592812682806" />
>>>>>>> 9913a05f6f5dd64cb019c7c02bf4851ed2fce190
<state x="625" y="385" key="git4idea.merge.GitPullDialog" timestamp="1591588719752">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="625" y="385" key="git4idea.merge.GitPullDialog/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1591588719752" />
</component>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment