fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysFollowupDao.java

@@ -1,6 +1,6 @@
package com.matrix.system.hive.dao;

import com.matrix.system.app.dto.FollowupCommonetListDto;
import com.matrix.system.app.dto.FollowupListDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -40,5 +40,5 @@

    void updateZan(@Param("id")Long id, @Param("zans")String zans);

   List<SysFollowup> selectByAppDto(FollowupCommonetListDto followupCommonetListDto);
   List<SysFollowup> selectByAppDto(FollowupListDto followupListDto);
}