Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/io/qyi/e5/outlook/bean/OutlookVo.java
#	src/main/java/io/qyi/e5/outlook/bean/bo/SaveRandomBo.java
#	src/main/java/io/qyi/e5/outlook/controller/OutlookController.java
#	src/main/java/io/qyi/e5/outlook/entity/Outlook.java
#	src/main/java/io/qyi/e5/outlook/service/IOutlookService.java
#	src/main/java/io/qyi/e5/outlook/service/impl/OutlookServiceImpl.java
#	src/main/resources/application.properties
This commit is contained in:
APLS 2020-12-13 21:55:09 +08:00
commit 14ee3c2e30

View File

@ -10,7 +10,6 @@ import lombok.Data;
**/
@Data
public class OutlookVo {
private int id;
private String clientId;
private String clientSecret;
private Integer cronTimeRandomStart;