Merge branch 'dev' into master-6#

# Conflicts:
#	jeecg-module-gather/src/main/java/org/jeecg/modules/watch/s7gatherWatch.java

jeecg-module-gather/src/main/java/org/jeecg/modules/watch/OpcGatherWatch.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Slf4j
 @EnableAsync
 @Component
-//@EnableScheduling
+@EnableScheduling
 public class OpcGatherWatch {
 
     @Autowired