Merge branch 'Lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-java

ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBzhan.java

@@ -45,7 +45,7 @@ public class TcBzhan extends BaseEntity
     private String url;
 
     /** 类型 */
-    @Excel(name = "类型")
-    @ApiModelProperty(value = "类型")
+    @Excel(name = "1.B站 2.小红书",readConverterExp = "1=B站,2=小红书",combo = "1=B站,2=小红书")
+    @ApiModelProperty(value = "1.B站 2.小红书,1=B站,2=小红书")
     private Long type;
 }

ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTtsum.java

@@ -37,7 +37,7 @@ public class TcTtsum extends BaseEntity
     /** 账号ID */
     @Excel(name = "账号ID")
     @ApiModelProperty(value = "账号ID")
-    private Long zhId;
+    private String zhId;
 
     /** 简介 */
     @Excel(name = "简介")
@@ -45,7 +45,7 @@ public class TcTtsum extends BaseEntity
     private String intro;
 
     /** 类型 */
-    @Excel(name = "类型")
-    @ApiModelProperty(value = "类型")
+    @Excel(name = "1.今日头条 2.快手",readConverterExp = "1=今日头条,2=快手",combo = "1=今日头条,2=快手")
+    @ApiModelProperty(value = "1.今日头条 2.快手,1=今日头条,2=快手")
     private Long type;
 }

ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWz.java

@@ -51,6 +51,6 @@ public class TcWz extends BaseEntity
 
     /** 备案许可证号 */
     @Excel(name = "备案许可证号")
-    @ApiModelProperty(value = "id")
+    @ApiModelProperty(value = "备案许可证号")
     private String icp;
 }