Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

mhotel/src/com/happy/action/HousePriceAction.java

@@ -26,9 +26,6 @@ import java.util.stream.Collectors;
 
 public class HousePriceAction extends BaseController implements ModelDriven<HousePriceDto> {
 
-    private HttpServletRequest request;
-    public HttpServletResponse response;
-
     /**
      * 房型ID
      */

mhotel/src/com/happy/dao/impl/BookingComplainImplDao.java

@@ -166,13 +166,13 @@ public class BookingComplainImplDao implements BookingComplainDao {
     @Override
     public ProgressDetailsVo progressDetails(String complaintId) {
         String sql="SELECT\n" +
-                "\tbc.booking_id as bookingId,\n" +
+                "\tb.order_num as bookingId,\n" +
                 "\tbc.id as complaintId,\n" +
                 "\tbc.title,\n" +
                 "\tbc.content,\n" +
                 "\tbc.create_date as dateTime\n" +
                 "FROM\n" +
-                "\t`booking_complaint` bc\n" +
+                "\t`booking_complaint` bc LEFT JOIN booking b on b.id=bc.booking_id and b.status_del=1  \n" +
                 " where bc.id=:complaintId and bc.`status`=1";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("complaintId", complaintId);