Merge branch 'master' of http://111.198.38.3:3000/365wy/dccloud into master

# Conflicts:
#	.gitignore

.gitignore

@@ -1,15 +1,15 @@
 /WebAPIBase.NetCore/.vs
 /WebAPIBase.NetCore/WebAPIBase.NetCore/obj
 /WebAPIBase.NetCore/WebAPIBase.NetCore/bin
-/WebAPIBase.NetCore/WebAPIBase.NetCore.Enties/obj
-/WebAPIBase.NetCore/WebAPIBase.NetCore.Enties/bin
-/WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCore/obj
-/WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCore/bin
-/WebAPIBase.NetCore/Data/obj
 /WebAPIBase.NetCore/Data/bin
-/WebAPIBase.NetCore/Model/obj
+/WebAPIBase.NetCore/Data/obj
 /WebAPIBase.NetCore/Model/bin
-/WebAPIBase.NetCore/Service/obj
+/WebAPIBase.NetCore/Model/obj
 /WebAPIBase.NetCore/Service/bin
-/WebAPIBase.NetCore/Utils/obj
+/WebAPIBase.NetCore/Service/obj
 /WebAPIBase.NetCore/Utils/bin
+/WebAPIBase.NetCore/Utils/obj
+/WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCore/obj
+/WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCore/bin
+/WebAPIBase.NetCore/WebAPIBase.NetCore.Enties/bin
+/WebAPIBase.NetCore/WebAPIBase.NetCore.Enties/obj