Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java

@@ -1,5 +1,6 @@
 package com.stdiet.custom.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -7,6 +8,8 @@ import com.stdiet.common.annotation.Excel;
 import com.stdiet.common.core.domain.BaseEntity;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 业务提成比例对象 sys_commision
@@ -28,6 +31,8 @@ public class SysCommision extends BaseEntity {
      */
     private Long userId;
 
+    private List<Long> userIds;
+
     /**
      * 岗位id
      */
@@ -54,6 +59,11 @@ public class SysCommision extends BaseEntity {
     @Excel(name = "比例", suffix = "%")
     private Float rate;
 
+    /** 比例开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
     /**
      * 提成
      */

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysNutritionalVideo.java

@@ -22,6 +22,8 @@ public class SysNutritionalVideo extends BaseEntity
     @Excel(name = "视频分类ID")
     private Long cateId;
 
+    private String cateName;
+
     /** 阿里云视频ID */
     @Excel(name = "阿里云视频ID")
     private String videoId;
@@ -30,6 +32,9 @@ public class SysNutritionalVideo extends BaseEntity
     @Excel(name = "视频封面URL")
     private String coverUrl;
 
+    //预览URL
+    private String previewUrl;
+
     /** 视频标题 */
     @Excel(name = "视频标题")
     private String title;
@@ -50,9 +55,21 @@ public class SysNutritionalVideo extends BaseEntity
     @Excel(name = "是否显示，0不显示 1显示，默认0")
     private Integer showFlag;
 
+    /** 优先级，默认0 */
+    @Excel(name = "优先级，默认0")
+    private Long priorityLevel;
+
+    /** 视频付费等级，0无需付费 1客户可看 2付费可看 */
+    @Excel(name = "视频付费等级，0无需付费 1客户可看 2付费可看")
+    private Long payLevel;
+
+    private String payLevelName;
+
     /** 删除标识，0未删除 1已删除，默认0 */
     private Integer delFlag;
 
     //文件名称
     private String fileName;
+
+    private String key;
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysVideoClassify.java

@@ -0,0 +1,33 @@
+package com.stdiet.custom.domain;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+
+/**
+ * 视频分类对象 sys_video_classify
+ *
+ * @author xzj
+ * @date 2021-05-05
+ */
+@Data
+public class SysVideoClassify extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    private String cateName;
+
+    /** 类型标识，0全部可看 1客户可看 2额外付费观看 */
+    @Excel(name = "类型标识，0全部可看 1客户可看 2额外付费观看")
+    private Integer payFlag;
+
+    /** 删除标识 0未删除 1已删除 */
+    private Integer delFlag;
+}