From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 8686025..6bbb818 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,9 +55,12 @@
@ApiModelProperty(value = "1未出账2已出账")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "账单类型 1充电算帐单 2账号结算帐单")
+ @TableField("billType")
+ private Integer billType;
@ApiModelProperty(value = "1日结2月结")
- @TableField("timeType")
- private Integer timeType;
+ @TableField("orderState")
+ private Integer orderState;
@ApiModelProperty(value = "账户类型 1微信商户 2支付宝商户")
@TableField("payType")
private Integer payType;
--
Gitblit v1.7.1