Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 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>("");

   }