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

hdw

2018-11-02 b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d

 gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java

@@ -46,7 +46,7 @@
            }

         }

      }

      dev_record.setPicture_num(file.size());

      //dev_record.setPicture_num(file.size());

      //System.out.println(dev_record);

      ServiceModel model=service.add(dev_record);

      result=tojson(model);