Merge branch 'master' into master-任务组

陈昶聿

9 天以前 dbdd6dd8934575741a4816cf3af3493b014d3305

 smartor/src/main/java/com/smartor/domain/SSOUserInfo.java

@@ -43,6 +43,11 @@
     */
    private String phone;

    /**
     * 职工ID
     */
    private String zhiGongID;

    @Override
    public String toString() {
        return "SSOUserInfo{" +