From a9d17098b99649ee6e41a087917dafc421053785 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 14 Aug 2020 14:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD=20-=20nei?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java | 4 ++-- .../java/com/epmet/dto/form/UpdateCustomizedFormDTO.java | 4 ++-- .../dto/result/FunctionCustomizedDetailResultDTO.java | 7 +------ .../src/main/resources/mapper/FunctionCustomizedDao.xml | 1 - 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java index 830361aeb3..20d3fd5298 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java @@ -65,8 +65,8 @@ public class SaveFunctionCustomizedFormDTO implements Serializable { private String domainName; /** - * 来源app(政府端:gov、居民端:resi) + * 来源app(工作端:gov、居民端:resi) */ - @NotBlank(message = "来源app(政府端:gov、居民端:resi)不能为空") + @NotBlank(message = "来源app(工作端:gov、居民端:resi)不能为空") private String fromApp; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java index ccd5483a49..5deee63b26 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java @@ -65,8 +65,8 @@ public class UpdateCustomizedFormDTO implements Serializable { private String domainName; /** - * 来源app(政府端:gov、居民端:resi) + * 来源app(工作端:gov、居民端:resi) */ - @NotBlank(message = "来源app(政府端:gov、居民端:resi)不能为空") + @NotBlank(message = "来源app(工作端:gov、居民端:resi)不能为空") private String fromApp; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java index c66714806e..b9f30936f9 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java @@ -29,11 +29,6 @@ public class FunctionCustomizedDetailResultDTO implements Serializable { */ private String functionExplain; - /** - * 定制详情ID - */ - private String customizedId; - /** * 默认名称 */ @@ -60,7 +55,7 @@ public class FunctionCustomizedDetailResultDTO implements Serializable { private String domainName; /** - * 来源app(政府端:gov、居民端:resi) + * 来源app(工作端:gov、居民端:resi) */ private String fromApp; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml index d852ad6dea..f862114288 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml @@ -9,7 +9,6 @@ cu.FUNCTION_ID functionId, f.SHOPPING_STATUS shoppingStatus, f.FUNCTION_EXPLAIN functionExplain, - cu.ID customizedId, cu.CUSTOMIZED_NAME customizedName, cu.ICON_LARGE_IMG iconLargeImg, cu.ICON_SMALL_IMG iconSmallImg,