Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2022-02-28 b9afd5585645c215df0ec0006a8af46bd7d80523

 ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml

@@ -18,6 +18,9 @@
        <result property="updateBy" column="update_by"/>
        <result property="delFlag" column="del_flag"/>
    </resultMap>
    <select id="customPageList" resultType="com.ruoyi.demo.domain.vo.TestDemoVo">
        SELECT * FROM test_demo ${ew.customSqlSegment}
    </select>


</mapper>
</mapper>