From 3dd88eb315a90c2b793e10b0b987a6c3b09a8650 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 14 八月 2024 16:44:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/QTInfoDTO.java | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/QTInfoDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/QTInfoDTO.java index fa2f615..094b3db 100644 --- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/QTInfoDTO.java +++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/QTInfoDTO.java @@ -1,16 +1,12 @@ package com.vci.dto; -import com.alibaba.fastjson.annotation.JSONField; import com.vci.common.qt.object.QueryTemplate; -import com.vci.model.BaseLinkModel; -import com.vci.starter.web.annotation.Column; import lombok.Data; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 鏌ヨ妯℃澘鍒楄〃浼犺緭瀵硅薄 @@ -19,13 +15,24 @@ */ @Data public class QTInfoDTO { - public String qtName; - public String btmName; - public String creator; - public long createTime; - public String createTimeText; - public short levelFlag; - public String qtUIText; - public String qtText; - public QueryTemplate queryTemplate; + //鏌ヨ妯℃澘鍚� + private String qtName; + //绫诲瀷鍚� + private String btmName; + //鍒涘缓浜� + private String creator; + //鍒涘缓鏃堕棿 + private long createTime; + private String createTimeText; + //"0:鏅�氭煡璇㈡ā鏉�; 1:楂樼骇鏌ヨ妯℃澘" + private short levelFlag; + //鏌ヨ妯℃澘鐣岄潰锛岃繖鏄珮绾ф煡璇㈢殑 + private String qtUIText; + //鏌ヨ妯℃澘鍚� + private String qtText; + //鏌ヨ妯℃澘淇℃伅 + private QueryTemplate queryTemplate; + //鏌ヨ鏉′欢锛屽悗绔繘琛岀浉鍏宠В鏋� + private List<HashMap<String,String>> condition; + private HashMap<String,Object> tree = new HashMap<>(); } -- Gitblit v1.9.3