Merge branch 'dev_ic_mp' into develop

# Conflicts: # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
4 years ago · 684093cdec
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@ -49,8 +49,8 @@ import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.SendVerificationCodeFormDTO;
-import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.VolunteerRegResiFormDTO;
+import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.result.ResiUserBaseInfoResultDTO;