fix

netflix-dao/src/main/java/com/cyksj/model/entity/WorkOrderChatHistory.java

@@ -21,12 +21,12 @@ public class WorkOrderChatHistory extends BaseEntity {
 	/**
 	 * 消息发送方
 	 */
-	private Messenger from;
+	private Messenger fromUser;
 
 	/**
 	 * 消息接收方
 	 */
-	private Messenger to;
+	private Messenger toUser;
 
 	/**
 	 * 聊天的用户id

netflix-service/src/main/java/com/cyksj/service/user/impl/WorkOrderFrontServiceImpl.java

@@ -70,8 +70,8 @@ public class WorkOrderFrontServiceImpl implements WorkOrderFrontService {
 		workOrderMapper.insert(workOrder);
 
 		WorkOrderChatHistory workOrderChatHistory = new WorkOrderChatHistory();
-		workOrderChatHistory.setFrom(WorkOrderChatHistory.Messenger.user);
-		workOrderChatHistory.setTo(WorkOrderChatHistory.Messenger.root);
+		workOrderChatHistory.setFromUser(WorkOrderChatHistory.Messenger.user);
+		workOrderChatHistory.setToUser(WorkOrderChatHistory.Messenger.root);
 		workOrderChatHistory.setUserId(userId);
 		workOrderChatHistory.setWorkOrderId(workOrder.getId());
 		workOrderChatHistory.setContent(content);
@@ -106,8 +106,8 @@ public class WorkOrderFrontServiceImpl implements WorkOrderFrontService {
 			}
 			if (imgs.length() > 2000) throw BusinessRuntimeException.getInstance("选择图片过多");
 		}
-		history.setFrom(WorkOrderChatHistory.Messenger.user);
-		history.setTo(WorkOrderChatHistory.Messenger.root);
+		history.setFromUser(WorkOrderChatHistory.Messenger.user);
+		history.setToUser(WorkOrderChatHistory.Messenger.root);
 		historyMapper.insert(history);
 	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/sys/WorkOrderController.java

@@ -123,8 +123,8 @@ public class WorkOrderController {
 		WorkOrder workOrder = workOrderMapper.selectById(workOrderId);
 		Assert.notNull(workOrder, "该工单不存在");
 
-		history.setFrom(WorkOrderChatHistory.Messenger.root);
-		history.setTo(WorkOrderChatHistory.Messenger.user);
+		history.setFromUser(WorkOrderChatHistory.Messenger.root);
+		history.setToUser(WorkOrderChatHistory.Messenger.user);
 		history.setReplyCustomerServiceId(adminId);
 		history.setUserId(workOrder.getUserId());
 		String content = history.getContent();