Merge branch 'master' into whole_new

Helius

2020-09-13 099e6d54520dad06b887340ba02d532235360e5d

 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;