From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改

---
 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