Merge remote-tracking branch 'origin/dev' into dev

pz-applet/src/main/java/com/pz/applet/AppletSessionListController.java

@@ -89,8 +89,8 @@ public class AppletSessionListController extends BaseController {
                         sessionListVo.setMessage(messageVos.get(0).getContent());
                     } else {
                         List<MessageVo> messageVoList = messageMapper.selectVoList(Wrappers.<Message>lambdaQuery()
-                            .eq(Message::getSender, targetUserId)
-                            .eq(Message::getReceiver, getUserId())
+                            .eq(Message::getSender, getUserId())
+                            .eq(Message::getReceiver, targetUserId)
                             .eq(Message::getIsRead, 1)
                             .orderByDesc(Message::getCreateTime));
                         if (CollectionUtils.isNotEmpty(messageVoList)) {

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml

@@ -39,7 +39,8 @@
         yyod.over_time AS overtime,
         yyod.voucher AS voucher,
         su.user_name AS userName,
-        yyod.create_Time as createTime
+        yyod.create_Time as createTime,
+        yyod.time_of_appointment as timeOfAppointment
         FROM zqgh_order AS yyod
         LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
         LEFT JOIN city AS c ON c.id = tlo.city_id