Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

whyclj

2019-01-08 a4066e2393247519328d0d7b0896724cda64bab4

 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;