From 35c390431b4ffa1e3f50371a46b4e9ac63d9aa70 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 17 四月 2026 09:45:08 +0800
Subject: [PATCH] Merge branch 'saas' of http://nonxin.cn:8090/r/product/product-server-tool-face/V2.0.0 into saas
---
src/main/java/com/product/face/service/FaceCacheService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index 85f00ad..5f9677a 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -174,13 +174,14 @@
FieldSetEntity fieldInfo = BaseUtil.getSingleInfoByCache("琛ㄥ瓧娈典俊鎭�", new String[]{tableUuid, fieldName});
String label = config.getString(FaceConst.FIELD_PROPERTY_LABEL);
boolean search = !"0".equals(config.getString("isSearch"));
+ String format = config.getString("format");
String fieldUuid = null;
String fieldReference = null;
if (!FieldSetEntity.isEmpty(fieldInfo)) {
fieldUuid = fieldInfo.getString(FaceConst.UUID);
fieldReference = fieldInfo.getString(FaceConst.FIELD_FIELD_REFERENCE);
}
- faceListEntity.addField(fieldName, fieldUuid, label, !StringUtils.isEmpty(setWidth)? setWidth+"%" : null, i, fieldReference,search);
+ faceListEntity.addField(fieldName, fieldUuid, label, !StringUtils.isEmpty(setWidth)? setWidth+"%" : null, i, fieldReference,search, format);
}
//楠岃瘉琛ㄥ崟涓殑瀛楁鏄惁瀛樺湪
if (faceListEntity != null && !CollectionUtil.isEmpty(faceListEntity.getFaceFields())) {
--
Gitblit v1.9.2