Test_Project_Web/e5
1
0
Fork 0
mirror of https://github.com/luoye663/e5.git synced 2024-12-26 19:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# 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 c8ffc93c28
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/io/qyi/e5/outlook/bean/OutlookVo.java
View File

@ -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;