Merge remote-tracking branch 'origin/master'

doum

6 小时以前 cb221a76856b945b4501b6628cebe1815303f2f3

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java

@@ -16,7 +16,7 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Member;