Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-06 d462cdb62cc5a55c5a3e94899dab7f5c035b8f23

 cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml

@@ -2,7 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.activity.mapper.UserPointsMerchandiseMapper">

    <!-- 开启二级缓存 -->
    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>

</mapper>