Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/mailConfig.properties

@@ -5,7 +5,7 @@
#\u90AE\u7BB1\u8D26\u53F7
mailUsername=
#\u90AE\u7BB1\u6388\u6743\u7801
mailPassword=
mailPassword=Perfect8900
#\u65F6\u95F4\u5EF6\u8FDF
mailTimeout=25000
#\u53D1\u9001\u4EBA