Pārlūkot izejas kodu

Merge branch 'xuhj-dev-20231115' into 'master'

bug修复

See merge request dcuc-tjdsj/auth-service!251
黄资权 1 gadu atpakaļ
vecāks
revīzija
282cf82989

+ 1 - 1
dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/auth/vo/zerotrust/roleorgauth/RoleOrgAuthVo.java

@@ -28,7 +28,7 @@ public class RoleOrgAuthVo {
     @ApiModelProperty(value = "角色名称")
     private String roleName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GTM+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "有效期时间。为null的时候即为长期")
     private Date activeTime;

+ 2 - 2
dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/statistics/StatisticsReqVo.java

@@ -20,12 +20,12 @@ public class StatisticsReqVo {
     private String year;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GTM+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "统计开始时间")
     private Date startTime;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GTM+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "统计结束时间")
     private Date endTime;
 }