Merge remote-tracking branch 'origin/master'

This commit is contained in:
bupengxiang
2023-04-28 14:10:21 +08:00
@@ -176,8 +176,8 @@
</select> </select>
<select id="reportManagerPage" parameterType="com.adc.da.report.vo.ReportQueryVo" resultType="com.adc.da.report.vo.ReportVo"> <select id="reportManagerPage" parameterType="com.adc.da.report.vo.ReportQueryVo" resultType="com.adc.da.report.vo.ReportVo">
SELECT SELECT DISTINCT
t.id, trl.report_id,
t.year, t.year,
t.name, t.name,
t.keycontent, t.keycontent,