diff --git a/springboot-demo/README.md b/springboot-demo/README.md index 4d9bdb4..e35eead 100644 --- a/springboot-demo/README.md +++ b/springboot-demo/README.md @@ -31,8 +31,11 @@ springBoot-demo 是一个SpringBoot的基础框架项目,可以在此项目上 springBoot-demo ├── pom.xml ├── README.md -├── build-dev.xml -├── README.md +├── build-dev.bat ant打包脚本启动命令 +├── build-dev.xml ant打包脚本 +├── git-info.bat git信息获取 +├── start.sh linux启动脚本 +├── stop.sh linux停止动脚本 └── src ├── main │   ├── java diff --git a/springboot-demo/src/main/java/com/pancm/vo/BasePage.java b/springboot-demo/src/main/java/com/pancm/vo/BasePage.java index 0336ad1..ae705bd 100644 --- a/springboot-demo/src/main/java/com/pancm/vo/BasePage.java +++ b/springboot-demo/src/main/java/com/pancm/vo/BasePage.java @@ -58,7 +58,7 @@ public class BasePage { protected String orderString; public String getOrderBy() { - if (!StringUtils.isEmpty(this.sortName) && StringUtils.isEmpty(this.sortOrder)) { + if (!StringUtils.isEmpty(this.sortName) && !StringUtils.isEmpty(this.sortOrder)) { String orderBy = this.sortName + " " + this.sortOrder; if (!StringUtils.isEmpty(this.defaultOrder) && !orderBy.equals(defaultOrder)) { orderBy += ", " + defaultOrder; diff --git a/springboot-demo/src/main/resources/build.properties b/springboot-demo/src/main/resources/build.properties index 8de3149..0ab57c4 100644 --- a/springboot-demo/src/main/resources/build.properties +++ b/springboot-demo/src/main/resources/build.properties @@ -1,4 +1,4 @@ build_app = springboot-demo -build_time = 2024-01-15 14:13:36 +build_time = 2024-01-15 15:48:50 git_commit = git_branch =