suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20250521_fix' into 'master'

Browse Source 
Cc 20250521 fix

See merge request hangzhou/java/custom_zxjp!92
This commit is contained in:
苏竹红
2025-05-21 09:47:06 +00:00
parent 4bc1faa7a3 d5639c8833
commit 9a5946ecf5
10 changed files with 47 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java
View File

@@ -16,6 +16,8 @@ public class MiniShopsResponse {
private String shopName;
@ApiModelProperty("店铺编码")
private String shopCode;
@ApiModelProperty("云流水编码")
private String ylsCode;
@ApiModelProperty("店铺详细地址")
private String detailAddress;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -45,6 +46,7 @@ public class BaseInfoVO {
@ApiModelProperty("加盟模式")
private Integer joinMode;
public BaseInfoVO(){}
/**
* 写一个构造方法 参数是BaseInfoVO

2
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java
View File

@@ -20,6 +20,8 @@ public class IntendPendingVO extends BaseInfoVO {
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
private Date updateTime;
public IntendPendingVO(){}
public IntendPendingVO(BaseInfoVO baseInfoVO) {

4
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java
View File

@@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/1 16:37
@@ -14,7 +16,7 @@ public class PayStagePendingVO extends BaseInfoVO {
@ApiModelProperty("缴费时间 2024年04月23日 16:00")
private String payTime;
private Date updateTime;
public PayStagePendingVO(){};
public PayStagePendingVO(BaseInfoVO baseInfoVO) {

3
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java
View File

@@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/1 16:55
@@ -14,6 +16,7 @@ public class SigningPendingVO extends BaseInfoVO {
@ApiModelProperty("提交时间 2024年04月23日 16:00")
private String submitTime;
private Date updateTime;
public SigningPendingVO(){};