Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

 src/main/java/com/moral/controller/MobileController.java

@@ -89,7 +89,7 @@
    */

   @RequestMapping("reportDevice")

   public AppData<String> installDevice(EquDeviceAdapter equDeviceAdapter) {

      deviceService.saveOrUpdateDevice(equDeviceAdapter.toDevice());

      deviceService.addOrModify(equDeviceAdapter.toDevice());

      return new AppData<String>("");

   }