Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/sen...

whyclj

2019-06-29 82c1e7ced425f43781b0cd01290fad298f51e623

 sensor/src/com/fgkj/actions/Sensor_mapinfoAction.java

@@ -13,7 +13,7 @@
   public String searchAll() {

      ServiceModel model= service.searchAll();

      result=tojson(model);

      System.out.println(result);

      //System.out.println(result);

      return SUCCESS;

   }