Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop
# Conflicts:
# web/.vs/Web/v16/.suo
# web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
# web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
# web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
# web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
# web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
# web/web/Bin/Release/Publish/web.config
| | |
|---|
| | | <<<<<<< HEAD |
|---|
| | | <<<<<<< Updated upstream |
|---|
| | | 03ac8fb778df47064b4ab65f28af8408156b7fa4 |
|---|
| | | ======= |
|---|
| | | 4e3d3c0d46e0394eded6a28ceeaec6a8f69625db |
|---|
| | | >>>>>>> Stashed changes |
|---|
| | | ======= |
|---|
| | | 03ac8fb778df47064b4ab65f28af8408156b7fa4 |
|---|
| | | >>>>>>> 751731362e5fcf901065c25eaed0319cf7a27cc1 |
|---|
| | |
|---|
| | | <<<<<<< HEAD |
|---|
| | | <<<<<<< Updated upstream |
|---|
| | | c4762145da2a34560c5dc93e2958bfb07137e5f2 |
|---|
| | | ======= |
|---|
| | | 4680df9d251d534abbe2f1eb51d69736b996d0d8 |
|---|
| | | >>>>>>> Stashed changes |
|---|
| | | ======= |
|---|
| | | c4762145da2a34560c5dc93e2958bfb07137e5f2 |
|---|
| | | >>>>>>> 751731362e5fcf901065c25eaed0319cf7a27cc1 |
|---|
