|
@@ -3,7 +3,8 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<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/api/controller/UserCenter.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/UserCenter.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/common/service/UserSynth.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/UserSynth.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/ActivityApplyItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/ActivityApplyItem.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -361,7 +362,8 @@
|
|
|
<workItem from="1688086241992" duration="4697000" />
|
|
|
<workItem from="1688112644185" duration="11000" />
|
|
|
<workItem from="1688195313870" duration="1940000" />
|
|
|
- <workItem from="1688345763945" duration="1627000" />
|
|
|
+ <workItem from="1688345763945" duration="3664000" />
|
|
|
+ <workItem from="1688455154865" duration="399000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|