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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

 src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml

@@ -363,6 +363,7 @@
    order by create_time desc
  </select>
  <select id="countStatistics" resultType="java.lang.Integer">
    select count(0) from(
    select count(0)
    from sys_hazardous_waste
    <where>
@@ -387,6 +388,7 @@
      </if>
      group by project,department,unit
    </where>
    ) shw
  </select>
  <select id="selectStatistics" resultType="com.nanometer.smartlab.entity.HazardousWaste">
    select