|
@@ -4,7 +4,6 @@
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" 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$/application/user/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Member.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/user/view/member/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/member/form.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -270,7 +269,7 @@
|
|
|
<workItem from="1679359715116" duration="25702000" />
|
|
|
<workItem from="1679532313623" duration="31448000" />
|
|
|
<workItem from="1679619041819" duration="29965000" />
|
|
|
- <workItem from="1679706054685" duration="16280000" />
|
|
|
+ <workItem from="1679706054685" duration="16369000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|