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

jyy

2021-04-07 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad

 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);
}