Merge branch 'master' of wangchaoqun/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/dao/vip/Mall2PointsRulesDao.java

@@ -6,6 +6,7 @@ import com.kmall.admin.dto.Mall2PointsRulesDto;
 import com.kmall.admin.haikong.vo.PointsRulesAndDetailVO;
 import com.kmall.common.utils.Query;
 import com.kmall.manager.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -28,7 +29,7 @@ public interface Mall2PointsRulesDao extends BaseDao<Mall2PointsRulesEntity> {
      * @param nowTime 当前时间
      * @return 积分生成规则
      */
-    List<PointsRulesAndDetailVO> queryListByTime(Date nowTime, String pointsStoreId);
+    List<PointsRulesAndDetailVO> queryListByTime(@Param("nowTime") Date nowTime, @Param("pointsStoreId") String pointsStoreId);
 
     Integer saveMall2PointsRulesDetil(List<Mall2RulesDto> pointsRulesList);