Merge remote-tracking branch 'origin/dev' into dev

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ServeRecord.java

@@ -38,5 +38,14 @@
    @ApiModelProperty("服务备注")
    @TableField("remark")
    private String remark;
    @ApiModelProperty("现场照片(多张照片 ','隔开)")
    @TableField("card_pic")
    private String cardPic;
    @ApiModelProperty("现场照片(多张照片 ','隔开)")
    @TableField("machine_pic")
    private String machinePic;
    @ApiModelProperty("现场照片(多张照片 ','隔开)")
    @TableField("paper_pic")
    private String paperPic;

}