Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

9 天以前 c174ab473487cbf92f382197f84e05ed22de258a

 server/visits/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java

@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.model.*;
import com.doumee.service.ScreenService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;