Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop

wangsheng

2022-03-01 a89e6ba4b31d13e437d04146490ba8f1c299da08

1
2
3
4
5
6
7
8
9
10
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< Updated upstream
<preserve resultType="2" virtualPath="/web/Setting.ashx" hash="ffffffff89671860" filehash="fffffc0158ca183c" flags="110000" assembly="App_Web_tlwmm4hc" type="SettingHandler">
=======
<preserve resultType="2" virtualPath="/web/Setting.ashx" hash="ffffffff89671860" filehash="ffffc3782af3c205" flags="110000" assembly="App_Web_p2jueioo" type="SettingHandler">
>>>>>>> Stashed changes
    <filedeps>
        <filedep name="/web/Setting.ashx" />
    </filedeps>
</preserve>