Merge remote-tracking branch 'origin/master'

doum

8 天以前 3c5771460c280139a53e0c451e6ceb8742680b5c

 server/services/src/main/java/com/doumee/dao/dto/CateringDTO.java

@@ -17,6 +17,9 @@
@ApiModel("餐饮标准信息")
public class CateringDTO {

    @ApiModelProperty(value = "分类主键")
    private Integer id;

    @ApiModelProperty(value = "类型：早餐、中餐、晚餐")
    private String name;