diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 9c626dc118..78649491c3 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -27,9 +27,9 @@
1.2.24
3.5.19
- 3.5.10.1
+ 3.5.12
+ 1.5.4
4.3.1
- 1.4.13
3.0.6
3.41.0
8.1.3.140
diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
index 48e901d624..ded0384000 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
@@ -207,12 +207,6 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper {
return this;
}
- @Override
- public MPJLambdaWrapperX selectCount(SFunction column, String alias) {
- super.selectCount(column, alias);
- return this;
- }
-
@Override
public MPJLambdaWrapperX selectCount(SFunction column, SFunction alias) {
super.selectCount(column, alias);
@@ -225,12 +219,6 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper {
return this;
}
- @Override
- public MPJLambdaWrapperX selectSum(SFunction column, String alias) {
- super.selectSum(column, alias);
- return this;
- }
-
@Override
public MPJLambdaWrapperX selectSum(SFunction column, SFunction alias) {
super.selectSum(column, alias);
@@ -243,12 +231,6 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper {
return this;
}
- @Override
- public MPJLambdaWrapperX selectMax(SFunction column, String alias) {
- super.selectMax(column, alias);
- return this;
- }
-
@Override
public MPJLambdaWrapperX selectMax(SFunction column, SFunction alias) {
super.selectMax(column, alias);
@@ -261,12 +243,6 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper {
return this;
}
- @Override
- public MPJLambdaWrapperX selectMin(SFunction column, String alias) {
- super.selectMin(column, alias);
- return this;
- }
-
@Override
public MPJLambdaWrapperX selectMin(SFunction column, SFunction alias) {
super.selectMin(column, alias);
@@ -279,12 +255,6 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper {
return this;
}
- @Override
- public MPJLambdaWrapperX selectAvg(SFunction column, String alias) {
- super.selectAvg(column, alias);
- return this;
- }
-
@Override
public MPJLambdaWrapperX selectAvg(SFunction column, SFunction alias) {
super.selectAvg(column, alias);
@@ -297,12 +267,6 @@ public class MPJLambdaWrapperX extends MPJLambdaWrapper {
return this;
}
- @Override
- public MPJLambdaWrapperX selectLen(SFunction column, String alias) {
- super.selectLen(column, alias);
- return this;
- }
-
@Override
public MPJLambdaWrapperX selectLen(SFunction column, SFunction alias) {
super.selectLen(column, alias);
diff --git a/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm b/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm
index ee9fc49f97..42afdf90ae 100644
--- a/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm
+++ b/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm
@@ -316,7 +316,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
}
// 插入
#end
- ${subClassNameVar}.clean() // 清理掉创建、更新时间等相关属性值
+ ${subClassNameVar}.clean(); // 清理掉创建、更新时间等相关属性值
${subClassNameVars.get($index)}Mapper.insert(${subClassNameVar});
return ${subClassNameVar}.getId();
}
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
index fdac956ff7..635e12ac24 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
@@ -180,7 +180,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
#end
},
toolbarConfig: {
- refresh: { code: 'query' },
+ refresh: true,
search: true,
},
} as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>,
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm
index 97404b0211..4001ed3992 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm
@@ -131,7 +131,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
enabled: true,
},
toolbarConfig: {
- refresh: { code: 'query' },
+ refresh: true,
search: true,
},
#else
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm
index 3bb2b6a4a1..f9232d6b50 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm
@@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
#end
},
toolbarConfig: {
- refresh: { code: 'query' },
+ refresh: true,
search: true,
},
} as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>,
diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm
index 4dd5a6f1b4..5afb9c7a0d 100644
--- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm
+++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm
@@ -125,7 +125,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
enabled: true,
},
toolbarConfig: {
- refresh: { code: 'query' },
+ refresh: true,
search: true,
},
#else
diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
index 6032f4ac31..4452212428 100644
--- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
+++ b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
@@ -264,9 +264,6 @@ public class PayTransferServiceImpl implements PayTransferService {
}
int count = 0;
for (PayTransferDO transfer : list) {
- if (!transfer.getId().equals(54L)) {
- continue;
- }
count += syncTransfer(transfer) ? 1 : 0;
}
return count;