mirror of
https://github.com/luoye663/e5.git
synced 2024-12-25 11:18:50 +00:00
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:
commit
14ee3c2e30
@ -10,7 +10,6 @@ import lombok.Data;
|
|||||||
**/
|
**/
|
||||||
@Data
|
@Data
|
||||||
public class OutlookVo {
|
public class OutlookVo {
|
||||||
private int id;
|
|
||||||
private String clientId;
|
private String clientId;
|
||||||
private String clientSecret;
|
private String clientSecret;
|
||||||
private Integer cronTimeRandomStart;
|
private Integer cronTimeRandomStart;
|
||||||
|
Loading…
Reference in New Issue
Block a user