From d3239b6a098724db5a29b4f48ddad5f8a0402cea Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 05 七月 2023 15:35:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java |   96 +++++++++++++++++++++++++-----------------------
 1 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
index be49c9c..da4b3a1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
@@ -38,110 +38,110 @@
 	/**
 	 * 鎵�灞炴ā鏉�
 	 */
-	private String classifytemplateoid;
+	private String classifyTemplateOid;
 
 	/**
 	 * 鎵�灞炴ā鏉挎樉绀烘枃鏈�
 	 */
-	private String classifytemplateoidName;
+	private String classifyTemplateOidName;
 	/**
 	 * 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
 	 */
-	private String classifyattributeoid;
+	private String classifyAttributeOid;
 
 	/**
 	 * 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
 	 */
-	private String classifyattributeoidName;
+	private String classifyAttributeOidName;
 	/**
 	 * 灞炴�х殑绫诲瀷
 	 */
-	private String attributedatatype;
+	private String attributeDataType;
 
 	/**
 	 * 鏄惁鍏抽敭灞炴��
 	 */
-	private String keyattrflag;
+	private String keyAttrFlag;
 
 	/**
 	 * 鏄惁蹇�熸煡璇㈠睘鎬�
 	 */
-	private String queryattrflag;
+	private String queryAttrFlag;
 
 	/**
 	 * 鏄惁楂樼骇鏌ヨ灞炴��
 	 */
-	private String seniorqueryattrflag;
+	private String seniorQueryAttrFlag;
 
 	/**
 	 * 鐩镐技鏌ラ噸灞炴��
 	 */
-	private String samerepeatattrflag;
+	private String sameRepeatAttrFlag;
 
 	/**
 	 * 鏄惁鎺掑簭
 	 */
-	private String sortattrflag;
+	private String sortAttrFlag;
 
 	/**
 	 * 鏄惁鐢熸垚浜岀淮鐮�
 	 */
-	private String qrcodeflag;
+	private String qrcodeFlag;
 
 	/**
 	 * 鏄惁鐢熸垚涓�缁寸爜
 	 */
-	private String barcodeflag;
+	private String barcodeFlag;
 
 	/**
 	 * 缁勫悎瑙勫垯
 	 */
-	private String componentrule;
+	private String componentRule;
 
 	/**
 	 * 楠岃瘉瑙勫垯
 	 */
-	private String verifyrule;
+	private String verifyRule;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆灞傜骇
 	 */
-	private String classifyinvokelevel;
+	private String classifyInvokeLevel;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
 	 */
-	private String classifyinvokeattr;
+	private String classifyInvokeAttr;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
 	 */
-	private String classifyinvokeattrname;
+	private String classifyInvokeAttrName;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
 	 */
-	private String classifyinvokeeditflag;
+	private String classifyInvokeEditFlag;
 
 	/**
 	 * 鐮佸�煎簭鍙�
 	 */
-	private Integer ordernum;
+	private Integer orderNum;
 
 	/**
 	 * 琛ㄥ崟閲屾槸鍚︽樉绀�
 	 */
-	private String formdisplayflag;
+	private String formDisplayFlag;
 
 	/**
 	 * 鍒楄〃閲屾槸鍚︽樉绀�
 	 */
-	private String tabledisplayflag;
+	private String tableDisplayFlag;
 
 	/**
 	 * 鎵�灞炲睘鎬у垎缁�
 	 */
-	private String attributegroup;
+	private String attributeGroup;
 
 	/**
 	 * 浣跨敤鏋氫妇娉ㄥ叆鐨勫瓧绗︿覆鏍煎紡
@@ -151,27 +151,27 @@
 	/**
 	 * 浣跨敤鏋氫妇鑻辨枃缂栧彿
 	 */
-	private String enumid;
+	private String enumId;
 
 	/**
 	 * 浣跨敤鏋氫妇涓枃鍚嶇О
 	 */
-	private String enumname;
+	private String enumName;
 
 	/**
 	 * 鏋氫妇鏄惁鍙互缂栬緫
 	 */
-	private String enumeditflag;
+	private String enumEditFlag;
 
 	/**
 	 * 鍙傜収鐨勪笟鍔$被鍨嬭嫳鏂囧悕绉�
 	 */
-	private String referbtmid;
+	private String referBtmId;
 
 	/**
 	 * 鍙傜収鐨勪笟鍔$被鍨嬩腑鏂囧悕绉�
 	 */
-	private String referbtmname;
+	private String referBtmName;
 
 	/**
 	 * 鍙傜収绐楀彛閰嶇疆
@@ -181,97 +181,97 @@
 	/**
 	 * 鏄惁蹇呰緭
 	 */
-	private String requireflag;
+	private String requireFlag;
 
 	/**
 	 * 鏄惁鍙
 	 */
-	private String readonlyflag;
+	private String readOnlyFlag;
 
 	/**
 	 * 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
 	 */
-	private Integer controllength;
+	private Integer controlLength;
 
 	/**
 	 * 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
 	 */
-	private String formdisplaystyle;
+	private String formDisplayStyle;
 
 	/**
 	 * 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
 	 */
-	private String tabledisplaystyle;
+	private String tableDisplayStyle;
 
 	/**
 	 * 琛ㄥ崟涓秴閾炬帴鍐呭
 	 */
-	private String formhref;
+	private String formHref;
 
 	/**
 	 * 琛ㄦ牸涓秴閾炬帴鍐呭
 	 */
-	private String tablehref;
+	private String tableHref;
 
 	/**
 	 * 灏忔暟绮惧害
 	 */
-	private Integer precisionlength;
+	private Integer precisionLength;
 
 	/**
 	 * 灏忔暟鍒诲害
 	 */
-	private Integer scalelength;
+	private Integer scaleLength;
 
 	/**
 	 * 鍙栧�艰寖鍥�
 	 */
-	private String valuearea;
+	private String valueArea;
 
 	/**
 	 * 鏃堕棿鏍煎紡
 	 */
-	private String codedateformat;
+	private String codeDateFormat;
 
 	/**
 	 * 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
 	 */
-	private String tabledisplayjs;
+	private String tableDisplayJs;
 
 	/**
 	 * 鏄惁鏄剧ず澶氳鏂囨湰
 	 */
-	private String textareaflag;
+	private String textAreaFlag;
 
 	/**
 	 * 棰勮鍥�
 	 */
-	private String imageflag;
+	private String imageFlag;
 
 	/**
 	 * 榛樿鍊�
 	 */
-	private String defaultvalue;
+	private String defaultValue;
 
 	/**
 	 * 鍓嶇紑
 	 */
-	private String prefixvalue;
+	private String prefixValue;
 
 	/**
 	 * 鍚庣紑
 	 */
-	private String suffixvalue;
+	private String suffixValue;
 
 	/**
 	 * 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
 	 */
-	private String filtersourceattr;
+	private String filterSourceAttr;
 
 	/**
 	 * 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
 	 */
-	private String filtersourceattrname;
+	private String filterSourceAttrName;
 
 	/**
 	 * 灞炴�у垪琛ㄤ腑鐨勫搴�
@@ -306,5 +306,9 @@
 	 */
 	//@Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
 	private String parentQueryAttr;
+	/**
+	 * 杈撳叆鎻愮ず
+	 */
+	private String inputTip;
 
 }

--
Gitblit v1.9.3