Compare commits
No commits in common. "714cdfae238dcb92ecba3a457ec6f88fb20f171c" and "c1ec6b26477f660c5e622d71d369c24714ffac47" have entirely different histories.
714cdfae23
...
c1ec6b2647
|
@ -129,12 +129,7 @@ public class ConfigServiceDirective implements Serializable {
|
||||||
@Excel(name = "视频文件", width = 15)
|
@Excel(name = "视频文件", width = 15)
|
||||||
@ApiModelProperty(value = "视频文件")
|
@ApiModelProperty(value = "视频文件")
|
||||||
private java.lang.String mp4File;
|
private java.lang.String mp4File;
|
||||||
/**预览图片*/
|
|
||||||
@ApiModelProperty(value = "预览图片")
|
|
||||||
private java.lang.String previewFile;
|
|
||||||
/**即时指令图片*/
|
|
||||||
@ApiModelProperty(value = "即时指令图片")
|
|
||||||
private java.lang.String immediateFile;
|
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private Integer categoryRowSpan;
|
private Integer categoryRowSpan;
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
<result property="sysOrgCode" column="sys_org_code"/>
|
<result property="sysOrgCode" column="sys_org_code"/>
|
||||||
<result property="mp3File" column="mp3_file"/>
|
<result property="mp3File" column="mp3_file"/>
|
||||||
<result property="mp4File" column="mp4_file"/>
|
<result property="mp4File" column="mp4_file"/>
|
||||||
<result property="previewFile" column="preview_file"/>
|
|
||||||
<result property="immediateFile" column="immediate_file"/>
|
|
||||||
|
|
||||||
<collection property="tagList" ofType="com.nu.modules.directiveTag.entity.DirectiveTag">
|
<collection property="tagList" ofType="com.nu.modules.directiveTag.entity.DirectiveTag">
|
||||||
<id property="id" column="tagId"/>
|
<id property="id" column="tagId"/>
|
||||||
|
@ -64,8 +62,6 @@
|
||||||
c.sys_org_code,
|
c.sys_org_code,
|
||||||
c.mp3_file,
|
c.mp3_file,
|
||||||
c.mp4_file,
|
c.mp4_file,
|
||||||
c.preview_file,
|
|
||||||
c.immediate_file,
|
|
||||||
tag.id as tagId,
|
tag.id as tagId,
|
||||||
tag.tag_name as tagName
|
tag.tag_name as tagName
|
||||||
FROM nu_config_service_directive c
|
FROM nu_config_service_directive c
|
||||||
|
|
Loading…
Reference in New Issue