Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChu...

Pu Zhibing

2025-04-28 c399be7463c16b3787b3e591d3006628a11ab858

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java

@@ -35,7 +35,13 @@
                                          @Param("state") Integer state, @Param("couponUseType") Integer couponUseType,
                                          @Param("money") Double money, @Param("pageNum") Integer pageNum,
                                          @Param("size") Integer size);

    
    
    List<Map<String, Object>> queryCoupon1(@Param("uid") Integer uid, @Param("cityCode") String cityCode,
                                           @Param("state") Integer state, @Param("couponUseType") Integer couponUseType,
                                           @Param("money") Double money, @Param("pageNum") Integer pageNum,
                                           @Param("size") Integer size);
    
    /**
     * 获取优惠券列表
     * @param state