Merge remote-tracking branch 'origin/master'

app/common/model/works/ServiceWork.php

@@ -151,7 +151,7 @@ class ServiceWork extends BaseModel
 
     public function getAppointmentTimeAttr($value,$data)
     {
-        return !empty($data['appointment_time'])?date('Y-m-d H:i:s',$data['appointment_time']):'';
+        return !empty($data['appointment_time'])?date('Y/m/d H:i:s',$data['appointment_time']):'';
     }
 
     public function getReceiveTimeAttr($value,$data)