From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期一, 06 十一月 2023 23:36:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-core/src/main/java/models/igds.model.xml | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml index 49293d4..d1503fb 100644 --- a/igds-core/src/main/java/models/igds.model.xml +++ b/igds-core/src/main/java/models/igds.model.xml @@ -504,6 +504,10 @@ <PropertyDef name="createDate"> <Property name="dataType">Date</Property> </PropertyDef> + <PropertyDef name="lqgsdwdm"> + <Property/> + <Property name="label">绮潈鍗曚綅浠g爜</Property> + </PropertyDef> </DataType> <DataType name="dtDevice"> <Property name="creationType">com.ld.igds.models.Device</Property> @@ -959,7 +963,7 @@ </Property> </PropertyDef> <PropertyDef name="pestSer"> - <Property/> + <Property></Property> <Property name="label">姘斾綋鍒嗘満</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property> @@ -968,7 +972,7 @@ </Property> </PropertyDef> <PropertyDef name="verbSer"> - <Property/> + <Property></Property> <Property name="label">閫氶鍒嗘満</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property> -- Gitblit v1.9.3