Merge branch 'master' into release-3.2.0-241012-base

src/modules/createmodel/alipay/components/ResultTable.vue

@@ -461,7 +461,7 @@ export default {
             console.log(this.$store.state)
             let payload={
                 "page":1,
-                "pageSize":20,
+                "pageSize":this.$store.getters.getTpagesize,
                 "orders":[],
                 "values": this.getSearchValuesList(),
                 "fileId":this.$store.state.fileStore.fileobj.id,
@@ -736,6 +736,11 @@ export default {
     height: auto;
 }
 
+.el-form-item{
+    display: inline-block!important;
+    margin-bottom: 0!important;
+}
+
 .excel-btns-relation,.excel-btns{
     border-top: 2px outset wheat;
     border-bottom: 2px outset wheat;
@@ -746,8 +751,8 @@ export default {
 
 
     .el-form-item{
-        display: inline-block;
-        margin-bottom: 0;
+        display: inline-block!important;
+        margin-bottom: 0!important;
     }
 
     .el-date-editor.el-input, .el-date-editor.el-input__inner{