Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 730443b70de88d328ffa275f51f69280fda979e4

 inspection-server/src/main/resources/mapper/RawMaterialMapper.xml

@@ -26,11 +26,12 @@
               specifications_models                    specifications,
               unit,
               quantity                                 num,
               surveyor,
               type,
               DATE_FORMAT(inspection_date, '%Y-%m-%d') startTime,
               DATE_FORMAT(date_survey, '%Y-%m-%d')     endTime,
               DATE_FORMAT(create_time, '%Y-%m-%d')     formTime
        from lims_laboratory.raw_material
        where state = 1
          and type = 0
    </select>
</mapper>