Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java

@@ -1,6 +1,5 @@
 package com.cool.store.dto.trtc.callback;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -24,7 +23,7 @@ public class TencentVod {
     @JsonProperty("StartTimeStamp")
     private long startTimeStamp;
     @JsonProperty("EndTimeStamp")
-    private int endTimeStamp;
+    private long endTimeStamp;
 
     public String getUserId() {
         return userId;
@@ -82,11 +81,11 @@ public class TencentVod {
         this.startTimeStamp = startTimeStamp;
     }
 
-    public int getEndTimeStamp() {
+    public long getEndTimeStamp() {
         return endTimeStamp;
     }
 
-    public void setEndTimeStamp(int endTimeStamp) {
+    public void setEndTimeStamp(long endTimeStamp) {
         this.endTimeStamp = endTimeStamp;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleMenuDO.java

@@ -25,7 +25,7 @@ public class SysRoleMenuDO implements Serializable {
     private Long menuId;
 
     @ApiModelProperty("角色id")
-    private Long roleId;
+    private String roleId;
 
     @ApiModelProperty("菜单类型")
     private String platform;