解决合并冲突

src/main/java/com/jubotech/business/web/service/WxAccountService.java

@@ -174,8 +174,8 @@ public class WxAccountService {
 		return weChatAccountDao.findWeChatAccountInfo(cid, accountid);
 	}
 
-	public List<WxAccountInfo> findAllWeChatAccountInfo() {
-		return weChatAccountDao.findAllWeChatAccountInfo();
+	public List<WxAccountInfo> findAllWeChatAccountInfo(Integer isonline) {
+		return weChatAccountDao.findAllWeChatAccountInfo(isonline);
 	}
 
 	public List<WxAccountInfo> getAllWeChatAccountInfo() {

src/main/resources/config/mapper/WxAccountDao.xml

@@ -104,7 +104,8 @@
 	<select id="findAllWeChatAccountInfo" resultType="com.jubotech.business.web.domain.WxAccountInfo">
          select  * 
          from tbl_wx_accountinfo
-	</select>
+         where  isonline = #{isonline}
+    </select>
 
     <select id="getAllWeChatAccountInfo" resultType="com.jubotech.business.web.domain.WxAccountInfo">
         select  *