Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-26 992f5853fb625be015fa28e9a0154278b2ed41a2

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

@@ -38,7 +38,7 @@

   public SysVipInfo selectById(Long id);

   public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key, @Param("shopId") Long shopId);
   public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key);

   /**
    * 查询是否唯一 @Title: selectTotalByField
@@ -134,7 +134,7 @@
    * @param keyWord
    * @return
    */
   public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord, @Param("shopId") Long shopId);
   public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord);
   
   /**
    * 会员活跃状态自动修改