From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/ApplyForAdmission.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/ApplyForAdmission.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/ApplyForAdmission.java
index 1126abb..69f0c51 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/ApplyForAdmission.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/ApplyForAdmission.java
@@ -1,5 +1,6 @@
package com.ruoyi.account.api.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,57 +20,62 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
- @TableId("id")
- private Long id;
+ @TableId(value = "id")
+ private int id;
@ApiModelProperty(value = "申请用户id")
- @TableId("apply_user_id")
+ @TableField("apply_user_id")
private Long applyUserId;
@ApiModelProperty("商家名称")
- @TableId("shop_name")
+ @TableField("shop_name")
private String shopName;
@ApiModelProperty("商家封面图")
- @TableId("home_picture")
+ @TableField("home_picture")
private String homePicture;
@ApiModelProperty("店铺详情图")
- @TableId("details_picture")
+ @TableField("details_picture")
private String detailsPicture;
@ApiModelProperty("资质证书图片")
- @TableId("certification")
+ @TableField("certification")
private String certification;
@ApiModelProperty("店长姓名")
- @TableId("shop_manager")
+ @TableField("shop_manager")
private String shopManager;
@ApiModelProperty("电话")
- @TableId("phone")
+ @TableField("phone")
private String phone;
@ApiModelProperty(value = "客服电话（同步到t_phone表）")
@TableField("service_tel")
private String serviceTel;
- @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
- @TableId("business_date")
- private Integer businessDate;
+ @ApiModelProperty(value = "营业时间")
+ @TableField("business_time")
+ private String businessTime;
@ApiModelProperty(value = "经度")
- @TableId("longitude")
+ @TableField("longitude")
private String longitude;
@ApiModelProperty(value = "纬度")
- @TableId("latitude")
+ @TableField("latitude")
private String latitude;
@ApiModelProperty(value = "详细地址")
- @TableId("address")
+ @TableField("detail_address")
+ private String detailAddress;
+
+ @ApiModelProperty(value = "商家地址")
+ @TableField("address")
private String address;
+
@ApiModelProperty(value = "状态（0-待审核，1-审核通过，2-审核不通过）")
@TableField("status")
private Integer status;
--
Gitblit v1.7.1