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

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerSettingDao.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity;
import org.apache.ibatis.annotations.Param;

import io.lettuce.core.dynamic.annotation.Param;

import java.util.List;