Merge remote-tracking branch 'origin/master'

cuilei

6 天以前 b0ec9895cde2519bc085ac40acbeea89ae8b6f9d

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
#	lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java
#	lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java

@@ -77,6 +77,7 @@
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private java.util.Date updateTime;
    /**手机号*/
    @Excel(name = "手机号", width = 15)
    private String phone;
    private java.lang.String phone;
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java

@@ -827,7 +827,7 @@
            return null;
        }
        int agentId = thirdAppConfig.getDingtalk().getAgentIdInt();
        return JdtMessageAPI.recallMessage(agentId, msgTaskId, getAccessToken());
        return JdtMessageAPI.recallMessage(String.valueOf(agentId), msgTaskId, getAccessToken());
    }

    /**