From 3051a98788b91eb192ebb971858d053ce3d7292e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 01 十一月 2024 11:34:08 +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 | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 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 00d6993..e2efef1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -13,7 +13,7 @@
<dictionaries>
<dict code="protocol" title="鍗忚" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item1 dictCode="protocol" value="p206V1" name="鑰佸崗璁�" status="1" sort="0" />
<item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
</dictItem>
</dict>
@@ -49,19 +49,27 @@
<item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "5000" sort = "1"/>
+ <item2 rechargeAmount = "10000" sort = "2" />
+ <item3 rechargeAmount = "20000" sort = "3"/>
+ <item4 rechargeAmount = "30000" sort = "4"/>
+ <item5 rechargeAmount = "50000" sort = "5"/>
+ <item6 rechargeAmount = "100000" sort = "6"/>
+ </rechargeProfile>
</org1>
- <org2 tag="pj" name="鐗囪" enable="false">
+ <org2 tag="sp" name="娌欑洏" enable="true">
<districts>
- <province name="浜戝崡鐪�" num="53" level="0">
- <city name="涓芥睙甯�" num="23" level="1">
- <country name="姘歌儨鍘�" num="28" level="2" />
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="閰掓硥甯�" num="09" level="1">
+ <country name="鑲冨窞鍖�" num="02" level="2" />
</city>
</province>
</districts>
<dictionaries>
<dict code="protocol" title="鍗忚" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item1 dictCode="protocol" value="p206V1" name="鑰佸崗璁�" status="1" sort="0" />
<item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
</dictItem>
</dict>
@@ -69,9 +77,8 @@
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
<payments>
<item1 name="鐜伴噾"/>
- <item2 name="寰俊鏀粯"/>
- <item3 name="鏀粯瀹濇敮浠�"/>
- <item4 name="閾惰杞处"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
</payments>
<settings>
<item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
@@ -98,6 +105,14 @@
<item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "5000" sort = "1"/>
+ <item2 rechargeAmount = "10000" sort = "2" />
+ <item3 rechargeAmount = "20000" sort = "3"/>
+ <item4 rechargeAmount = "30000" sort = "4"/>
+ <item5 rechargeAmount = "50000" sort = "5"/>
+ <item6 rechargeAmount = "100000" sort = "6"/>
+ </rechargeProfile>
</org2>
<org3 tag="test" name="娴嬭瘯" enable="true">
<districts>
@@ -110,7 +125,7 @@
<dictionaries>
<dict code="protocol" title="鍗忚" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item1 dictCode="protocol" value="p206V1" name="鑰佸崗璁�" status="1" sort="0" />
<item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
</dictItem>
</dict>
@@ -118,9 +133,8 @@
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
<payments>
<item1 name="鐜伴噾"/>
- <item2 name="寰俊鏀粯"/>
- <item3 name="鏀粯瀹濇敮浠�"/>
- <item4 name="閾惰杞处"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
</payments>
<settings>
<item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
@@ -147,6 +161,14 @@
<item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "5000" sort = "1"/>
+ <item2 rechargeAmount = "10000" sort = "2" />
+ <item3 rechargeAmount = "20000" sort = "3"/>
+ <item4 rechargeAmount = "30000" sort = "4"/>
+ <item5 rechargeAmount = "50000" sort = "5"/>
+ <item6 rechargeAmount = "100000" sort = "6"/>
+ </rechargeProfile>
</org3>
</orgs>
</config>
\ No newline at end of file
--
Gitblit v1.8.0