Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

MrShi

9 天以前 2d02eb82474e43faedfe06910381ede0eda67f3c

 server/services/src/main/java/com/doumee/dao/business/model/OrderLog.java

@@ -20,6 +20,7 @@
@TableName("`order_log`")
public class OrderLog {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;