From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +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