Merge branch 'master' into 3.5

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

src/main/java/com/gogirl/domain/store/training/TrainingStartClass.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -23,12 +24,14 @@ public class TrainingStartClass {
 
     private String lecturer;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date time;
 
     private Integer duration;
 
     private Integer status;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     @TableField(exist = false)

src/main/resources/mapper/store/TakeLeaveEventMapper.xml

@@ -4,8 +4,8 @@
     <select id="appliedList" resultType="com.gogirl.domain.store.oa.TakeLeaveEvent">
         SELECT *
         from take_leave_event
-        where (start_time &lt;= #{endTime} and end_time &gt;= #{endTime}
-            or start_time &lt;= #{startTime} and start_time &gt;= #{startTime})
+        where (start_time &lt; #{endTime} and end_time &gt; #{endTime}
+            or start_time &lt; #{startTime} and start_time &gt; #{startTime})
           and apply_technician_id = #{applyTechnicianId}
           and `status` != 3
     </select>