Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!554

pom.xml

@@ -216,14 +216,25 @@
 			<version>${shiro.version}</version>
 			<version>${shiro.version}</version>
 		</dependency> -->
 		</dependency> -->
 
 
-		<!-- redis starter -->
-		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> 
-			</dependency> -->
-
+		<!-- redis starter   spring boot 与redis应用基本环境配置 -->
+		<dependency> 
+			<groupId>org.springframework.boot</groupId> 
+			<artifactId>spring-boot-starter-data-redis</artifactId> 
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
 		<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
-		<!-- <dependency> <groupId>org.springframework.session</groupId> <artifactId>spring-session-data-redis</artifactId> 
-			</dependency> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> 
-			<version>2.9.0</version> </dependency> -->
+		<!--spring session 与redis应用基本环境配置,需要开启redis后才可以使用，不然启动Spring boot会报错 -->
+		<dependency> 
+			<groupId>org.springframework.session</groupId> 
+			<artifactId>spring-session-data-redis</artifactId> 
+		</dependency>
+		<!--jedis --> 
+		<dependency> 
+			<groupId>redis.clients</groupId> 
+			<artifactId>jedis</artifactId> 
+			<version>2.9.0</version> 
+		</dependency>
+
+
 
 
 		<dependency>
 		<dependency>
 		    <groupId>com.alibaba</groupId>
 		    <groupId>com.alibaba</groupId>

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java

@@ -102,7 +102,7 @@ public class AttendanceTaskTiming{
 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 19 18 * * ?")
 //	@Scheduled(cron = "0 19 18 * * ?")
-	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行  
+	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行    
 	public void AttendanceTask() throws ParseException {
 	public void AttendanceTask() throws ParseException {
 
 
 		boolean implement = true;
 		boolean implement = true;

src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java

@@ -94,7 +94,7 @@ public class LastMonthtimingExport {
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); 
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); 
 	
 	
 //	@Scheduled(cron = "0 31 18 * * ?")
 //	@Scheduled(cron = "0 31 18 * * ?")
-	@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
+	@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行  
 	public void LastMonthtimingAttendanceTask() throws ParseException {
 	public void LastMonthtimingAttendanceTask() throws ParseException {
 		
 		
 		 //获取前月的最后一天
 		 //获取前月的最后一天

src/main/java/cn/timer/api/dto/qyzx/MenuStructureDto.java

 package cn.timer.api.dto.qyzx;
 package cn.timer.api.dto.qyzx;
 
 
+import java.io.Serializable;
+
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
@@ -9,8 +11,13 @@ import lombok.NoArgsConstructor;
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor
-public class MenuStructureDto {
+public class MenuStructureDto implements Serializable {
 	
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4944359899333609220L;
+
 	private String menuCode;
 	private String menuCode;
 	
 	
 	private String menuName;
 	private String menuName;