Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

.gitignore

@@ -3,3 +3,29 @@
 ################################################################################
 
 /CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Upload/Files/2022/06/22
+.vs/
+CallCenterApi/CallCenterAPI.WechatSDK/bin/
+CallCenterApi/CallCenterAPI.WechatSDK/obj/
+CallCenterApi/CallCenterApi.BLL/bin/
+CallCenterApi/CallCenterApi.BLL/obj/
+CallCenterApi/CallCenterApi.Common/bin/
+CallCenterApi/CallCenterApi.Common/obj/
+CallCenterApi/CallCenterApi.DAL/bin/
+CallCenterApi/CallCenterApi.DAL/obj/
+CallCenterApi/CallCenterApi.DB/bin/
+CallCenterApi/CallCenterApi.DB/obj/
+CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj.user
+CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/bin/
+CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/
+CallCenterApi/CallCenterApi.Model/bin/
+CallCenterApi/CallCenterApi.Model/obj/
+CallCenterCommon/CallCenter.QuartzService/bin/
+CallCenterCommon/CallCenter.QuartzService/obj/
+CallCenterCommon/CallCenter.Utility/bin/
+CallCenterCommon/CallCenter.Utility/obj/
+CallCenterCommon/CallCenter.WebChatServer/bin/
+CallCenterCommon/CallCenter.WebChatServer/obj/
+Push/bin/
+Push/obj/
+packages/
+

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -8051,7 +8051,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("workorderid"));
             if (!string.IsNullOrEmpty(strworkorderid))
             {
-                string sql = "select F_WorkOrderId,F_CreateTime,F_ComTitle,F_Result,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDeptName(F_MainDeptId) deptname "
+                string sql = "select F_WorkOrderId,F_CreateTime,F_ComTitle,F_ComContent,F_Result,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDeptName(F_MainDeptId) deptname "
                     + " from T_Bus_WorkOrder WITH(NOLOCK) where F_WorkOrderId ='" + strworkorderid + "'";
                 var dt = DbHelperSQL.Query(sql).Tables[0];
                 if (dt.Rows.Count > 0)
@@ -21786,7 +21786,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string Dataurl = web.DownloadString(url + "case_material_info" + "?WorkOrderId=" + WorkOrderId + "&file=" + file + "&id=" + id + "&type=" + type);
             }
         }
-        #endregion\
+        #endregion