From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 16 Mar 2021 18:35:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java index 9ff080f..7dc234e 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java +++ b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java @@ -54,7 +54,11 @@ } public String getIsFree() { - return isFree; + if ("1".equals(isFree)) { + return "是"; + } else { + return "否"; + } } public void setIsFree(String isFree) { -- Gitblit v1.9.1