~jiangyouyao/beauty-erp.git

jiangyouyao / beauty-erp

forked from beauty-erp

summary
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-12 26ffb618e472c3681f17b8b1b1a19ea55383928c

 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);
   
   /**
    * 会员活跃状态自动修改

			@@ -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);

			/**
			* 会员活跃状态自动修改