From 3dd540cf10d030f13ab3403d33a1e4ead2fc33a2 Mon Sep 17 00:00:00 2001 From: LiJun <LiJun@192.168.10.18> Date: 星期六, 03 十一月 2018 14:00:17 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/com/fgkj/dto/Deverror_record.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dto/Deverror_record.java b/gx_tieta/src/com/fgkj/dto/Deverror_record.java index 6d1eec5..8de47d5 100644 --- a/gx_tieta/src/com/fgkj/dto/Deverror_record.java +++ b/gx_tieta/src/com/fgkj/dto/Deverror_record.java @@ -181,10 +181,10 @@ + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3 + ", stationName5=" + stationName5 + ", record_time=" + record_time - + ", error_descript=" + error_descript + ", uid=" + uid - + ", error_en=" + error_en + ", note=" + note + ", page=" - + page + ", picture_one_blob=" + picture_one_blob - + ", picture_two_blob=" + picture_two_blob + + ", error_descript=" + error_descript + ", error_dispose=" + + error_dispose + ", uid=" + uid + ", error_en=" + error_en + + ", note=" + note + ", page=" + page + ", picture_one_blob=" + + picture_one_blob + ", picture_two_blob=" + picture_two_blob + ", picture_three_blob=" + picture_three_blob + ", picture_four_blob=" + picture_four_blob + ", picture_one=" + picture_one + ", picture_two=" + picture_two @@ -194,4 +194,5 @@ + } -- Gitblit v1.9.1