Merge remote-tracking branch 'origin/master' into test

sys-api/src/main/java/com/xy/dto/SysDictDto.java

@@ -69,7 +69,7 @@ public class SysDictDto {
     @Data
     @Accessors(chain = true)
     public static class SyncToProd {
-        @NotBlank(message = "logId不能为空")
+        @NotNull(message = "logId不能为空")
         @ApiModelProperty(value = "logId")
         private Long id;