From 398be7e48387b49ac209dd5ed5fe7a135f268e5c Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 28 十二月 2018 17:38:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
index 90834a1..18bd8cc 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -265,13 +265,13 @@
 	public static void main(String[] args) {
 		Fbs9100_setparamService fs = new Fbs9100_setparamService();
 		//fs.searchAll();
-		/*Fbs9100_setparam f=new Fbs9100_setparam();
+		Fbs9100_setparam f=new Fbs9100_setparam();
 	    
 		f.setNum(41);
 		f.setDev_id(910000024);
 		ServiceModel model=fs.serchbyDev_id(f);
-		System.out.println(model);*/
-		Calendar c = Calendar.getInstance(); 
+		System.out.println(model);
+		/*Calendar c = Calendar.getInstance(); 
 		long now_time = c.getTimeInMillis();
 		System.out.println("now_time:"+now_time);
 		try {
@@ -283,7 +283,7 @@
 		Calendar cl = Calendar.getInstance(); 
 		long moment_time = cl.getTimeInMillis();
 		System.out.println("moment_time:"+moment_time);
-		System.err.println((moment_time-now_time));
+		System.err.println((moment_time-now_time));*/
 	}
 
 }

--
Gitblit v1.9.1