From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
index fbc0370..2e4b284 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
@@ -25,12 +25,12 @@
Fbs9100_sysparam sys = getGson().fromJson(json, Fbs9100_sysparam.class);
ServiceModel model = service.update(sys);
{ String msg="";
- if(sys.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
- msg="淇敼"+sys.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
- }else if(sys.getNum()==FBS9100_ComBase.CMD_Start){
- msg="鍚姩"+sys.getDev_id()+"鐨勮澶囨斁鐢�";
- }else if(sys.getNum()==FBS9100_ComBase.CMD_Stop){
- msg="鍋滄"+sys.getDev_id()+"鐨勮澶囨斁鐢�";
+ if(sys.getNum()==FBS9100_ComBase.CMD_SetSYSSetParam){
+ msg="璁剧疆"+sys.getDev_id()+"鐨勮澶囩郴缁熷弬鏁�";
+ }else if(sys.getNum()==FBS9100_ComBase.CMD_ResetSystem){
+ msg="閲嶅惎"+sys.getDev_id()+"鐨勮澶�";
+ }else if(sys.getNum()==FBS9100_ComBase.CMD_SetSYSSetParam){
+ msg="鑾峰彇"+sys.getDev_id()+"鐨勮澶囩郴缁熷弬鏁�";
}
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
--
Gitblit v1.9.1