From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/OtherOrders.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/OtherOrders.java b/server/services/src/main/java/com/doumee/dao/business/model/OtherOrders.java
new file mode 100644
index 0000000..95119c2
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/model/OtherOrders.java
@@ -0,0 +1,90 @@
+package com.doumee.dao.business.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍏朵粬璁㈠崟璁板綍
+ * @author rk
+ * @date 2026/04/16
+ */
+@Data
+@ApiModel("鍏朵粬璁㈠崟璁板綍")
+@TableName("`other_orders`")
+public class OtherOrders {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name = "涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "0")
+ @ExcelColumn(name = "鏄惁宸插垹闄�")
+ private Integer deleted;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name = "鍒涘缓浜虹紪鐮�")
+ private Integer createUser;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name = "鍒涘缓鏃堕棿", width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name = "鏇存柊浜虹紪鐮�")
+ private Integer updateUser;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷锛�0=搴楅摵鎶奸噾璁㈠崟;1=鍙告満鎶奸噾璁㈠崟;2=閫炬湡璐圭敤璁㈠崟", example = "0")
+ @ExcelColumn(name = "璁㈠崟绫诲瀷", valueMapping = "0=搴楅摵鎶奸噾璁㈠崟;1=鍙告満鎶奸噾璁㈠崟;2=閫炬湡璐圭敤璁㈠崟;")
+ private Integer type;
+
+ @ApiModelProperty(value = "鍏宠仈浼氬憳涓婚敭", example = "1")
+ @ExcelColumn(name = "鍏宠仈浼氬憳涓婚敭")
+ private Integer memberId;
+
+ @ApiModelProperty(value = "瀹為檯鏀粯璐圭敤")
+ @ExcelColumn(name = "瀹為檯鏀粯璐圭敤")
+ private Long payAccount;
+
+ @ApiModelProperty(value = "鏀粯鐘舵�侊細0=鏈敮浠�;1=宸叉敮浠�", example = "0")
+ @ExcelColumn(name = "鏀粯鐘舵��", valueMapping = "0=鏈敮浠�;1=宸叉敮浠�;")
+ private Integer payStatus;
+
+ @ApiModelProperty(value = "鏀粯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name = "鏀粯鏃堕棿", width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ @ExcelColumn(name = "璁㈠崟缂栧彿")
+ private String code;
+
+ @ApiModelProperty(value = "寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
+ @ExcelColumn(name = "寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
+ private String wxExternalNo;
+
+ @ApiModelProperty(value = "鍏宠仈瀵勫瓨璁㈠崟涓婚敭", example = "1")
+ @ExcelColumn(name = "鍏宠仈瀵勫瓨璁㈠崟涓婚敭")
+ private Integer orderId;
+
+ @ApiModelProperty(value = "涓夋柟璁㈠崟鍙�")
+ @ExcelColumn(name = "涓夋柟璁㈠崟鍙�")
+ private String outTradeNo;
+}
--
Gitblit v1.9.3