From 17e2f65826b3b69871e45c88238e5c7317f7ecb7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 19 十二月 2024 10:12:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
index cf885bf..8082908 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
@@ -56,6 +56,7 @@
@ApiModelProperty(value = "变动时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "变动时间")
private LocalDateTime createTime;
@@ -67,6 +68,10 @@
@TableField("object_id")
private Long objectId;
+ @ApiModelProperty(value = "订单号")
+ @TableField("order_num")
+ private String orderNum;
+
@ApiModelProperty(value = "门店名称")
@TableField(exist = false)
@Excel(name = "门店名称")
--
Gitblit v1.7.1