From 5a1e5f522d854c1c7c4050da6f1972ef266ad5d4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 18:18:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java
index 8116db2..2a3ecf5 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java
@@ -55,6 +55,12 @@
@ApiModelProperty(value = "1未出账2已出账")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "1日结2月结")
+ @TableField("orderState")
+ private Integer orderState;
+ @ApiModelProperty(value = "账户类型 1微信商户 2支付宝商户")
+ @TableField("payType")
+ private Integer payType;
@ApiModelProperty(value = "uid")
@TableField(exist = false)
--
Gitblit v1.7.1