|
|
|
@ -9,7 +9,14 @@ |
|
|
|
<option name="autoReloadType" value="SELECTIVE" /> |
|
|
|
<option name="autoReloadType" value="SELECTIVE" /> |
|
|
|
</component> |
|
|
|
</component> |
|
|
|
<component name="ChangeListManager"> |
|
|
|
<component name="ChangeListManager"> |
|
|
|
<list default="true" id="841a97d6-fb7a-4203-9936-89f5a7cbed8f" name="变更" comment="shopping commit" /> |
|
|
|
<list default="true" id="841a97d6-fb7a-4203-9936-89f5a7cbed8f" name="变更" comment="shopping commit"> |
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" /> |
|
|
|
|
|
|
|
<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/example/demo3/Servlet/login.java" beforeDir="false" /> |
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/demo3/pojo/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/demo3/pojo/User.java" afterDir="false" /> |
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/UserMapper.xml" afterDir="false" /> |
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/login.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/login.jsp" afterDir="false" /> |
|
|
|
|
|
|
|
</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" /> |
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|
|
|
@ -203,7 +210,7 @@ |
|
|
|
<workItem from="1652831640701" duration="8942000" /> |
|
|
|
<workItem from="1652831640701" duration="8942000" /> |
|
|
|
<workItem from="1652812498631" duration="5883000" /> |
|
|
|
<workItem from="1652812498631" duration="5883000" /> |
|
|
|
<workItem from="1652815871388" duration="3279000" /> |
|
|
|
<workItem from="1652815871388" duration="3279000" /> |
|
|
|
<workItem from="1652812440545" duration="2582000" /> |
|
|
|
<workItem from="1652812440545" duration="4987000" /> |
|
|
|
</task> |
|
|
|
</task> |
|
|
|
<task id="LOCAL-00001" summary="shopping commit"> |
|
|
|
<task id="LOCAL-00001" summary="shopping commit"> |
|
|
|
<created>1652814834331</created> |
|
|
|
<created>1652814834331</created> |
|
|
|
@ -219,7 +226,14 @@ |
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
<updated>1652814899707</updated> |
|
|
|
<updated>1652814899707</updated> |
|
|
|
</task> |
|
|
|
</task> |
|
|
|
<option name="localTasksCounter" value="3" /> |
|
|
|
<task id="LOCAL-00003" summary="shopping commit"> |
|
|
|
|
|
|
|
<created>1652815114705</created> |
|
|
|
|
|
|
|
<option name="number" value="00003" /> |
|
|
|
|
|
|
|
<option name="presentableId" value="LOCAL-00003" /> |
|
|
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
|
|
<updated>1652815114705</updated> |
|
|
|
|
|
|
|
</task> |
|
|
|
|
|
|
|
<option name="localTasksCounter" value="4" /> |
|
|
|
<servers /> |
|
|
|
<servers /> |
|
|
|
</component> |
|
|
|
</component> |
|
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|
|
|