Merge remote-tracking branch 'origin/master'

无关风月

2026-01-13 d98af68f2ea108254ec362ac2497fd619e6dd3eb

 ruoyi-system/src/main/java/com/ruoyi/system/utils/xiMaUtil/XimaAIUtil.java

@@ -34,7 +34,7 @@
     * @param device_type 设备类型：android ios
     * @return
     */
    public JSONObject getAuthorizationH5(String out_user_id,String nickname,String phone,String sex,Integer height,Integer weight,String device_type) {
    public JSONObject getAuthorizationH5(String out_user_id,String nickname,String phone,String sex,String birthday,Integer height,Integer weight,String device_type) {
        TSysAiConfig sysAiConfig = sysAiConfigService.getById(1);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("client_id", sysAiConfig.getClientId());
@@ -42,6 +42,7 @@
        jsonObject.put("out_user_id", out_user_id);
        jsonObject.put("nickname", nickname);
        jsonObject.put("phone", phone);
        jsonObject.put("birthday", birthday);
        jsonObject.put("sex", sex);
        jsonObject.put("height", height);
        jsonObject.put("weight", weight);