Merge remote-tracking branch 'origin/cms' into anentang

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 src/main/resources/mapper/CmsAdInfoMapper.xml

@@ -14,4 +14,7 @@
        </if>
    </select>

    <select id="selectByGroupIdAndCompanyId" resultType="com.xcong.farmer.cms.modules.system.entity.CmsAdInfoEntity">
        select * from cms_ad_info where group_id=#{groupId} and company_id=#{companyId}
    </select>
</mapper>