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

jyy

2021-03-12 b12efd16399d217756bf71b92d88b29bd4781295

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

@@ -134,7 +134,7 @@
    * @param keyWord
    * @return
    */
   public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord);
   public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord,@Param("companyId") Long companyId);
   
   /**
    * 会员活跃状态自动修改