Merge branch 'hive2.0' of http://120.27.238.55:7000/r/beauty-erp into hive2.0

Helius

2021-03-17 24df3ed89ac1934bf0a0b9f74c4e5f227f0f82cf

 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;