Merge branch 'master' of http://111.30.93.211:10101/r/supipe

张晓波

2023-12-12 2bd6a932ddab51fff3185bf38435b4508203203c

 hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml

@@ -269,6 +269,7 @@
            where ssr.stock_type = 2 and YEAR(SYSDATE()) = YEAR(ssr.create_time) and MONTH(SYSDATE()) = MONTH(ssr.create_time)
            group by ssr.steel_id
            ) c on steel.steel_id = c.steel_id
            ORDER BY c.monthStock desc
    </select>

    <!--获取静养区-->