Merge remote-tracking branch 'origin/master'

zhs

15 小时以前 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6

 smartor/src/main/java/com/smartor/service/IServiceTelInfoService.java

@@ -10,7 +10,7 @@
     *
     * @return 结果
     */
    public List<Map<String,Object>> getList();
    public List<Map<String,Object>> getList(String orgid);

    /**
     * 设置电话状态