Merge branch 'pre' into 'master'

Pre

See merge request !135

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -142,7 +142,7 @@
                 </div>
 
                 <hr>
-                <div class="scoreTable">
+                <div class="couponTable">
                     <div class="row">
                         <div class="col-sm-12">
                             <div class="col-sm-12 select-table table-striped">
@@ -960,10 +960,10 @@
         .selectScore span {
             color: #ccc;
         }
-        .scoreTable {
+        .couponTable {
             margin-bottom: 12px;
             overflow-y: scroll;
-            max-height: 600px;
+            max-height: 270px;
         }
         .details-form-list {
             position: fixed;
@@ -978,7 +978,7 @@
         }
         .details-pop-inner {
             width: 800px;
-            height: 820px;
+            height: 490px;
             padding: 10px;
             background: #fff;
         }

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -65,8 +65,8 @@ spring:
     name: ${liquidnet.info.name}
   servlet:
     multipart:
-      max-file-size: 50MB
-      max-request-size: 100MB
+      max-file-size: 200MB
+      max-request-size: 200MB
   profiles:
     include: common-service #这里加载management相关公共配置
   rabbitmq: