Merge remote-tracking branch 'origin/main'

This commit is contained in:
xvv 2024-08-29 10:24:47 +08:00
commit 4e72ab17bf

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.marketingActivity.cardGiftActive.mapper.CardGiftActiveMapper"> <mapper namespace="com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponMapper">
<select id="pageVo" resultType="com.fuint.business.marketingActivity.cardCoupon.entity.CardCoupon"> <select id="pageVo" resultType="com.fuint.business.marketingActivity.cardCoupon.entity.CardCoupon">