Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 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