From fb5a9f2aa4dab720ff32ac229ac68f98de532a2a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 15 四月 2024 18:32:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index a9ea031..7650067 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -1,6 +1,5 @@
package com.vci.ubcs.code.applyjtcodeservice.controller;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
@@ -103,7 +102,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆dockingPreApplyForm")
public R<IPage<DockingPreApplyFormVO>> page(DockingPreApplyForm dockingPreApplyForm, Query query) {
- IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
+ IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query.setDescs("createTime")), Condition.getQueryWrapper(dockingPreApplyForm));
return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
}
--
Gitblit v1.9.3