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

xuhy

3 天以前 d90ac211d9168c1ce8d390838f367a0db00afb52

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/EvaluatePageVO.java

@@ -59,6 +59,10 @@
    @ApiModelProperty("服务单号")
    @TableField("serve_no")
    private String serveNo;
//    @TableField("createBy")
//    private String createBy;
//    @TableField("updateBy")
//    private String updateBy;

    @TableField("createTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")