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

mhotel/src/com/happy/service/impl/BookingComplaintImplService.java

@@ -130,7 +130,7 @@ public class BookingComplaintImplService implements BookingComplaintService {
             for (ComplaintPageVo vo : vos) {
                 String valueBykey = vo.getOrderStatus() == null ? "" : PayEnum.getValueBykey(Integer.valueOf(vo.getOrderStatus()));
                 vo.setOrderStatus(valueBykey);
-                String valueBykey1 = ProgressEnum.getValueBykey(Integer.valueOf(vo.getProgressType()));
+                String valueBykey1 = vo.getProgressType() == null ? "" : ProgressEnum.getValueBykey(Integer.valueOf(vo.getProgressType()));
                 vo.setProgressType(valueBykey1);
 
             }