Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

teachcloud-report/src/main/resources/application-dev.properties

@@ -13,7 +13,7 @@ spring.application.name=teachcloud-report
 db.host=192.168.10.136
 #db.host=localhost
 db.port=3306
-db.name=teachcloud-report
+db.name=teachcloud-report-617
 db.username=root
 db.password=Qmth87863577!
 #db.password=123456789
@@ -41,7 +41,7 @@ aliyun.oss.bucket=teachcloud-test
 aliyun.oss.url=http://${aliyun.oss.bucket}.${aliyun.oss.name}
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200