java/PlayPai.git

玩湃

blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-27 aa925d851857f50eff0556411366690d9a78a0e5

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java

@@ -27,6 +27,7 @@
                                                     @Param("activeStatus") Integer activeStatus,
                                                     @Param("state") Integer state,
                                                     @Param("page") Page<Map<String, Object>> page);

    List<Map<String, Object>> queryGoodsListOfSearchAudit(@Param("name")String name,
                                                     @Param("type")Integer type,
                                                     @Param("redemptionMethod")Integer redemptionMethod,

			@@ -27,6 +27,7 @@
			@Param("activeStatus") Integer activeStatus,
			@Param("state") Integer state,
			@Param("page") Page<Map<String, Object>> page);

			List<Map<String, Object>> queryGoodsListOfSearchAudit(@Param("name")String name,
			@Param("type")Integer type,
			@Param("redemptionMethod")Integer redemptionMethod,