Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj

This commit is contained in:
xiezhijun
2021-04-15 10:52:16 +08:00
5 changed files with 306 additions and 260 deletions

View File

@ -25,13 +25,14 @@ public class SysOrderNutritionistReplaceRecord extends BaseEntity
private Long orderId;
/** 更换的营养师ID */
@Excel(name = "更换的营养师ID")
private Long nutritionistId;
/** 更换的售后ID */
@Excel(name = "更换的售后ID")
private Long afterSaleId;
/** 更换的售后ID */
private Long nutriAssisId;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
@ -41,8 +42,15 @@ public class SysOrderNutritionistReplaceRecord extends BaseEntity
private Integer delFlag;
// 售后
@Excel(name = "售后")
private String afterSale;
//营养师
@Excel(name = "营养师")
private String nutritionist;
@Excel(name = "营养师助理")
private String nutriAssis;
}