Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-16 cdd5fe1813e63adcddd61581cb886b9d154e5a3c

 gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java

@@ -106,6 +106,9 @@
                  }

               }

            }

            if(success==list.size()) {

               break;

            }

            Calendar cl = Calendar.getInstance(); 

            long moment_time = cl.getTimeInMillis();

            time=moment_time-now_time;

@@ -142,6 +145,9 @@
                  }

               }

            }

            if(success==list.size()) {

               break;

            }

            Calendar cl = Calendar.getInstance(); 

            long moment_time = cl.getTimeInMillis();

            time=moment_time-now_time;