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

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

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

@@ -105,9 +105,9 @@
                     list.get(i).setNum(1);

                  }

               }

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

                  break;

               }

            }

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

               break;

            }

            Calendar cl = Calendar.getInstance(); 

            long moment_time = cl.getTimeInMillis();

@@ -144,9 +144,9 @@
                     list.get(i).setNum(1);

                  }

               }

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

                  break;

               }

            }

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

               break;

            }

            Calendar cl = Calendar.getInstance(); 

            long moment_time = cl.getTimeInMillis();