Merge remote-tracking branch 'origin/master'

liujie

2023-09-23 852681bc9257e9eaae64d027a9bc6d88f93f35b4

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

@@ -30,4 +30,16 @@
                                                      @Param("state")Integer state,
                                                      @Param("page")Page<Map<String, Object>> page);

    List<Map<String, Object>> queryCouponExamineList(@Param("name")String name,
                                                     @Param("type")Integer type,
                                                     @Param("userPopulation") Integer userPopulation,
                                                     @Param("distributionMethod")Integer distributionMethod,
                                                     @Param("auditStatus")Integer auditStatus,
                                                     @Param("page")Page<Map<String, Object>> page);


    List<Map<String, Object>> listRecord(@Param("objectPage") Page<Object> objectPage, @Param("id") Integer id, @Param("ids") List<Integer> ids, @Param("type") Integer type);


    void updateType(@Param("id") Long id);
}