From 5bfa227109b90b20b09345722b3232fac77a1ab1 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 11 九月 2024 11:41:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 130b67f..8e726f1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -10,12 +10,21 @@
</city>
</province>
</districts>
+ <dictionaries>
+ <dict code="protocol" title="鍗忚" valueType="2">
+ <dictItem>
+ <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
<payments>
<item1 name="鐜伴噾"/>
<item2 name="寰俊鏀粯"/>
<item3 name="鏀粯瀹濇敮浠�"/>
<item4 name="閾惰杞处"/>
+ <item5 name="鎹㈠崱"/>
</payments>
<settings>
<item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
@@ -30,14 +39,14 @@
</waterTypes>
<waterPrice price="0.90" />
<irrigateProfile>
- <item1 default_value = "10" unit = "2" sort = "1" type = "1"/>
- <item2 default_value = "20" unit = "2" sort = "2" type = "1" />
- <item3 default_value = "1" unit = "1" sort = "3" type = "1"/>
- <item4 default_value = "2" unit = "1" sort = "4" type = "1"/>
- <item5 default_value = "20" unit = "3" sort = "1" type = "2"/>
- <item6 default_value = "30" unit = "3" sort = "2" type = "2"/>
- <item7 default_value = "50" unit = "3" sort = "3" type = "2"/>
- <item8 default_value = "80" unit = "3" sort = "4" type = "2"/>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
</org1>
<org2 tag="pj" name="鐗囪" enable="false">
@@ -48,6 +57,14 @@
</city>
</province>
</districts>
+ <dictionaries>
+ <dict code="protocol" title="鍗忚" valueType="2">
+ <dictItem>
+ <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
<payments>
<item1 name="鐜伴噾"/>
@@ -68,14 +85,14 @@
</waterTypes>
<waterPrice price="0.90" />
<irrigateProfile>
- <item1 default_value = "10" unit = "2" sort = "1" type = "1"/>
- <item2 default_value = "20" unit = "2" sort = "2" type = "1" />
- <item3 default_value = "1" unit = "1" sort = "3" type = "1"/>
- <item4 default_value = "2" unit = "1" sort = "4" type = "1"/>
- <item5 default_value = "20" unit = "3" sort = "1" type = "2"/>
- <item6 default_value = "30" unit = "3" sort = "2" type = "2"/>
- <item7 default_value = "50" unit = "3" sort = "3" type = "2"/>
- <item8 default_value = "80" unit = "3" sort = "4" type = "2"/>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
</org2>
</orgs>
--
Gitblit v1.8.0