Merge branch 'develop'

src/main/ui/static/payment/partner/partner-manage.js

@@ -2283,8 +2283,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         //上传协议文件
         $scope.uploadAgreementFile = function (file) {
             if (file != null) {
-                if (file.size > 3 * 1024 * 1024) {
+                if (file.size > 10 * 1024 * 1024) {
-                    commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'})
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过5MB，请压缩后重试', type: 'error'})
                 } else {
                     $scope.agreementFileProgress = {value: 0};
                     Upload.upload({