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

gdg

2021-02-23 8b6a2a67a0bf081252648ba46fffd5591b3afc98

 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>