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

gdg

2021-02-02 529173267b4e7b4b296e92a8c8705e0da5180c89

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

@@ -30,8 +30,9 @@
      <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>