From 5f01e519924ed74b1a839e9fbd80cd35384f1f1d Mon Sep 17 00:00:00 2001 From: majintao Date: Thu, 22 Aug 2024 13:46:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E9=83=A8=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia-bkoff/src/main/webapp/apiUser/add.ftl | 1 + .../fangjia-bkoff/src/main/webapp/apiUser/edit.ftl | 12 +++++++++--- .../fangjia-bkoff/src/main/webapp/apiUser/list.ftl | 4 +++- .../main/java/com/fangjia/dal/sql/model/ApiUser.java | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 907506c9f..2f3071de2 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -51,6 +51,7 @@ diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index 3f8d5a463..9cbcda3d7 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -61,12 +61,18 @@ 账户类型 diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl index e16556d06..8a2361bc7 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl @@ -131,8 +131,10 @@ <#if bo.isTest==0> 正式账户 - <#else> + <#elseif bo.isTest==1> 测试账户 + <#else> + 内部账户 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java index 52806e4df..95216319c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java @@ -26,7 +26,7 @@ public class ApiUser implements SqlEntity { private Date creationDate; private Date modificationDate; private String company; - private int isTest; //0-Õýʽ¿͑ô 1-²âÊÔÓû§ + private int isTest; //0-Õýʽ¿͑ô 1-²âÊÔÓû§ 2-Äڲ¿²âÊÔÓû§ private Date deadTime; /** * Õ˻§ÓÃ;