Merge branch 'dev' into uat

# Conflicts:
#	src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java
#	src/main/java/com/luca/pilot/entity/ModuleEntity.java
#	src/main/java/com/luca/pilot/entity/Plan.java
#	src/main/java/com/luca/pilot/entity/PlanModule.java
#	src/main/java/com/luca/pilot/entity/PlanTask.java
#	src/main/java/com/luca/pilot/entity/ScaleModuleEntity.java
#	src/main/java/com/luca/pilot/entity/Site.java
#	src/main/java/com/luca/pilot/entity/SynchronizeTime.java
#	src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java
#	src/main/java/com/luca/pilot/util/CrfUtil.java
#	src/test/java/com/luca/pilot/PlanTaskTest.java