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

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

 src/main/webapp/WEB-INF/config-mybatis.xml

@@ -29,8 +29,10 @@
      <typeHandler handler="com.nanometer.smartlab.entity.handler.EmailSendStatusHandler"/>
      <typeHandler handler="com.nanometer.smartlab.entity.handler.DangerousFlagHandler"/>
      <typeHandler handler="com.nanometer.smartlab.entity.handler.WarningLevelHandler"/>
      <typeHandler handler="com.nanometer.smartlab.entity.handler.ReplaceDictTypeHandler"/>
      <typeHandler handler="com.nanometer.smartlab.entity.handler.WasterHandler"/>
   </typeHandlers>
    

</configuration>