From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdvisementPlayerParam.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdvisementPlayerParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdvisementPlayerParam.java
index d266011..60bbdb0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdvisementPlayerParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/AdvisementPlayerParam.java
@@ -9,7 +9,7 @@
private String keyword;
@NotEmpty
- private String equipmentState;
+ private int equipmentState;
@NotEmpty
- private String bindingState;
+ private int bindingState;
}
--
Gitblit v1.9.3