From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java
index fac0bb6..3eb7136 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrder.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -33,6 +35,10 @@
@TableField("app_user_id")
private String appUserId;
+ @ApiModelProperty(value = "诊所id")
+ @TableField("clinic_id")
+ private String clinicId;
+
@ApiModelProperty(value = "检测信息id")
@TableField("inspection_id")
private String inspectionId;
@@ -43,9 +49,10 @@
@ApiModelProperty(value = "订单总价")
@TableField("total_money")
- private Double totalMoney;
+ private BigDecimal totalMoney;
@ApiModelProperty(value = "检查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("check_time")
private LocalDateTime checkTime;
--
Gitblit v1.7.1