Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

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

    /**
     * 设置电话状态