Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

 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{" +