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

gdg

2021-01-08 aaec4271422fa9798ecc55901ad17f9557282806

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

@@ -29,6 +29,7 @@
      <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"/>
   </typeHandlers>
    
</configuration>