From 16f44651a78d00943aea51b26fc6a4f20518a648 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/equipment/vo/EquipmentVO.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/vo/EquipmentVO.java b/src/main/java/org/springblade/modules/equipment/vo/EquipmentVO.java
index 5fa6833..51f16ef 100644
--- a/src/main/java/org/springblade/modules/equipment/vo/EquipmentVO.java
+++ b/src/main/java/org/springblade/modules/equipment/vo/EquipmentVO.java
@@ -32,5 +32,8 @@
@ApiModel(value = "EquipmentVO对象", description = "EquipmentVO对象")
public class EquipmentVO extends Equipment {
private static final long serialVersionUID = 1L;
+ int type;
+ String pay;
+ String expireTime;
}
--
Gitblit v1.9.3