1.0解决冲突

ch-dao/src/main/java/com/wwdz/ch/db/impl/qiandao/QdUserSignInNoteDaoImpl.java

 package com.wwdz.ch.db.impl.qiandao;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.qiandao.QdUserSignInDao;
 import com.wwdz.ch.db.dao.qiandao.QdUserSignInNoteDao;
 import com.wwdz.ch.db.domain.qiandao.QdUserSignInNote;
 import com.wwdz.ch.db.domain.qiandao.QdUserSignInNoteExample;
@@ -10,7 +9,6 @@ import com.wwdz.ch.db.mapper.qiandao.QdUserSignInNoteMapper;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
-
 import java.util.List;
 
 @Repository

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/SignInTaskServiceImpl.java

@@ -33,4 +33,5 @@ public class SignInTaskServiceImpl implements SignInTaskService {
         }
         return Result.failed();
     }
+
 }