Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-19 44f9cd5c403584c39c8bb893f69244e4835daab8

 WebService/src/main/java/com/java110/web/components/floor/ListFloorComponent.java

@@ -21,6 +21,7 @@
     * @return ResponseEntity对象返回给页面
     */
    public ResponseEntity<String> list(IPageData pd) {

        return floorServiceSMOImpl.listFloor(pd);
    }