From a04453432c9898df83961eaea26dd97b65537f02 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 03 十二月 2025 09:56:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/models/core.model.xml |  115 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 707e70a..ea12e79 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -914,16 +914,16 @@
   <DataType name="dtNoticeParam">
     <Property name="matchType">com.fzzy.igds.data.NoticeParam</Property>
     <PropertyDef name="id">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="companyId">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="deptId">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="depotId">
-      <Property/>
+      <Property></Property>
       <Property name="label">瑁呭嵏浠撳簱</Property>
       <Property name="mapping">
         <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
@@ -932,11 +932,11 @@
       </Property>
     </PropertyDef>
     <PropertyDef name="customerName">
-      <Property/>
+      <Property></Property>
       <Property name="label">瀹㈡埛鍚嶇О</Property>
     </PropertyDef>
     <PropertyDef name="foodVariety">
-      <Property/>
+      <Property></Property>
       <Property name="label">绮鍝佺</Property>
       <Property name="mapping">
         <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
@@ -945,19 +945,19 @@
       </Property>
     </PropertyDef>
     <PropertyDef name="contractId">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="planId">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="foodType">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="year">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="type">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="weight">
       <Property name="dataType">Double</Property>
@@ -966,7 +966,7 @@
       <Property name="dataType">Double</Property>
     </PropertyDef>
     <PropertyDef name="completeStatus">
-      <Property/>
+      <Property></Property>
       <Property name="label">瀹屾垚鐘舵��</Property>
       <Property name="mapping">
         <Property name="mapValues">
@@ -995,7 +995,96 @@
       <Property name="dataType">Date</Property>
     </PropertyDef>
     <PropertyDef name="createUser">
-      <Property/>
+      <Property></Property>
+    </PropertyDef>
+  </DataType>
+  <DataType name="dtPledgeContract">
+    <Property name="creationType">com.fzzy.igds.domain.PledgeContract</Property>
+    <PropertyDef name="id">
+      <Property></Property>
+    </PropertyDef>
+    <PropertyDef name="contractNo">
+      <Property></Property>
+      <Property name="label">鍚堝悓缂栧彿</Property>
+    </PropertyDef>
+    <PropertyDef name="contractName">
+      <Property></Property>
+      <Property name="label">鍚堝悓鍚嶇О</Property>
+    </PropertyDef>
+    <PropertyDef name="contractAmount">
+      <Property name="dataType">Double</Property>
+      <Property name="label">鍚堝悓閲戦</Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeBank">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂閾惰</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;bankPR#listAll&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeCompany">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂鍏徃</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">dwmc</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="name">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂鍚嶇О</Property>
+    </PropertyDef>
+    <PropertyDef name="status">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂鐘舵��</Property>
+    </PropertyDef>
+    <PropertyDef name="signTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">绛捐鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeStart">
+      <Property name="dataType">Date</Property>
+      <Property name="label">寮�濮嬫椂闂�</Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeEnd">
+      <Property name="dataType">Date</Property>
+      <Property name="label">缁撴潫鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeDept">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂搴撳尯</Property>
+      <Property name="mapping">
+        <Property name="keyProperty">id</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
+        <Property name="valueProperty">kqmc</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="remark">
+      <Property></Property>
+      <Property name="label">澶囨敞璇存槑</Property>
+    </PropertyDef>
+    <PropertyDef name="companyId">
+      <Property></Property>
+      <Property name="label">缁勭粐缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="createBy">
+      <Property></Property>
+      <Property name="label">鍒涘缓浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="createTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">鍒涘缓鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="updateBy">
+      <Property></Property>
+      <Property name="label">鏇存柊浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="updateTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">鏇存柊鏃堕棿</Property>
     </PropertyDef>
   </DataType>
 </Model>

--
Gitblit v1.9.3