Merge remote-tracking branch 'origin/master'

doum

3 小时以前 462a7c752afead89a100522aea8bbfadaea2aab9

 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;