From 44ea114980783dca861409e2583f027dc0d4b922 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 20 Jan 2025 09:16:20 +0800 Subject: [PATCH] =?UTF-8?q?1/20=20=E9=BE=99=E6=B5=B71.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysParamConfigController.java | 4 ++-- .../entity/system/ProductRemarkSetEntity.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 86e32b00..925ed63f 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -191,12 +191,12 @@ public class SysParamConfigController { filterParamConfigRequest.setParamType(2); filterParamConfigRequest.setParamStatus(1); List systemParamConfigEntities = systemParamConfigService.queryPage(filterParamConfigRequest); - systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getParamKey)) + systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getId)) .collect(Collectors.toList()); ProductRemarkSetEntity productRemarkSetEntity = new ProductRemarkSetEntity(); - if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 8) { + if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 13) { for (int i = 0; i < systemParamConfigEntities.size(); i++) { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntities.get(i); diff --git a/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java b/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java index 09d7bacb..872a408e 100644 --- a/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java @@ -31,4 +31,20 @@ public class ProductRemarkSetEntity { private boolean remarkEnable7; private boolean remarkEnable8; + private String remarkKey9; + private String remarkKey10; + private String remarkKey11; + private String remarkKey12; + private String remarkKey13; + private String remarkTitle9; + private String remarkTitle10; + private String remarkTitle11; + private String remarkTitle12; + private String remarkTitle13; + + private boolean remarkEnable9; + private boolean remarkEnable10; + private boolean remarkEnable11; + private boolean remarkEnable12; + private boolean remarkEnable13; }