Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-21 c4f92fc59c25cc7564ff16895ab271c0d04f1e11

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

@@ -2,6 +2,7 @@

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.hive.bean.Article;
import com.matrix.system.hive.bean.ArticleType;
import org.apache.ibatis.annotations.Param;
import java.util.List;