Merge remote-tracking branch 'origin/lixuetao' into lixuetao

This commit is contained in:
bupengxiang
2023-05-15 16:09:59 +08:00
@@ -174,7 +174,7 @@
</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, t.id,
t.year, t.year,
t.name, t.name,