Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java

ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-
+import java.util.Date;
 
 
 /**
@@ -40,4 +40,8 @@ public class TestDemoAddBo {
     @NotBlank(message = "值不能为空")
     private String value;
 
+	/** 创建时间 */
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+
 }