From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java
index a2065de..f58062f 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyExtListVO.java
@@ -165,8 +165,7 @@
@ApiModelProperty(value = "缇氱緤骞冲彴搴旂敤鍙傛暟锛宩son鏍煎紡瀛樺偍{app_key:,aes_key:,app_secret:}" )
private String lingyangInfo;
- @ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
- private Byte status;
+ @ApiModelProperty(value = "鐘舵�� 1 寮�鍚� 0 绂佺敤")
+ private Integer status;
}
--
Gitblit v1.9.3