Merge remote-tracking branch 'origin/master'

mall-miniapp-service/src/main/resources/bootstrap.properties

@@ -13,7 +13,7 @@ wechat.keyPath=classpath:/static/apiclient_cert.p12
 #��������
 server.servlet.context-path=/zfdminiapp
 spring.servlet.multipart.max-file-size=40MB
-spring.servlet.multipart.max-request-size=40MB
+spring.servlet.multipart.max-request-size=50MB
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.file-size-threshold=0
 #�Ƿ�ֱ��web�˴�ӡ������Ϣ