diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java index 3fb9c07..661b829 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java @@ -9,7 +9,7 @@ public enum StageDataType { RADIATION_PROCESS(1, "辐照过程"), TEST_PROCESS(2, "测试过程"), - ANNEAL_PROCESS(3, "测试过程"), + ANNEAL_PROCESS(3, "退火过程"), ; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java index d06d78a..8bbad7d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java @@ -91,7 +91,7 @@ public class DocumentLibraryController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(documentLibrary, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(documentLibrary, req.getParameterMap()).orderByAsc("tags"); Page page = new Page(pageNo, pageSize); IPage pageList = documentLibraryService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index 4187c94..e59093d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -282,7 +282,9 @@ public class ExperimentController extends JeecgController