Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-11-05 d3d7078262d784444fe6cda3d7065b75981aa1f1

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml

@@ -11,10 +11,12 @@
                </province>
            </districts>
            <dictionaries>
                <dict code="protocol" title="协议" valueType="2">
                <dict code="icProtocol" title="IC卡协议" valueType="2">
                    <dictItem>
                        <item1 dictCode="protocol" value="p206V1" name="老协议" status="1" sort="0" />
                        <item2 dictCode="protocol" value="p206V202404" name="新协议" status="0" sort="1" />
                        <!-- 靳建伟版本IC卡协议 卡中编号已经加长（与王江海版本一致），与纯老版本协议不同 -->
                        <item1 dictCode="icProtocol" value="icP202203" name="老卡协议" status="1" sort="0" />
                        <!-- 王江海版本IC卡协议 -->
                        <item2 dictCode="icProtocol" value="icP202404" name="新卡协议" status="0" sort="1" />
                    </dictItem>
                </dict>
            </dictionaries>
@@ -67,10 +69,12 @@
                </province>
            </districts>
            <dictionaries>
                <dict code="protocol" title="协议" valueType="2">
                <dict code="icProtocol" title="IC卡协议" valueType="2">
                    <dictItem>
                        <item1 dictCode="protocol" value="p206V1" name="老协议" status="1" sort="0" />
                        <item2 dictCode="protocol" value="p206V202404" name="新协议" status="0" sort="1" />
                        <!-- 靳建伟版本IC卡协议 卡中编号已经加长（与王江海版本一致），与纯老版本协议不同 -->
                        <item1 dictCode="icProtocol" value="icP202203" name="老卡协议" status="1" sort="0" />
                        <!-- 王江海版本IC卡协议 -->
                        <item2 dictCode="icProtocol" value="icP202404" name="新卡协议" status="0" sort="1" />
                    </dictItem>
                </dict>
            </dictionaries>
@@ -123,10 +127,12 @@
                </province>
            </districts>
            <dictionaries>
                <dict code="protocol" title="协议" valueType="2">
                <dict code="icProtocol" title="IC卡协议" valueType="2">
                    <dictItem>
                        <item1 dictCode="protocol" value="p206V1" name="老协议" status="1" sort="0" />
                        <item2 dictCode="protocol" value="p206V202404" name="新协议" status="0" sort="1" />
                        <!-- 靳建伟版本IC卡协议 卡中编号已经加长（与王江海版本一致），与纯老版本协议不同 -->
                        <item1 dictCode="icProtocol" value="icP202203" name="老卡协议" status="1" sort="0" />
                        <!-- 王江海版本IC卡协议 -->
                        <item2 dictCode="icProtocol" value="icP202404" name="新卡协议" status="0" sort="1" />
                    </dictItem>
                </dict>
            </dictionaries>