Merge #72 into master from cc_20260323_minor_req

fix:钱包线上支付校验使用网商钱包账户;分账信息初始化状态修改

* cc_20260323_minor_req: (7 commits squashed)

  - fix:机会点接口新增筛选条件

  - fix:字段隐藏

  - fix:字段隐藏

  - fix:初始化钱包分账信息状态改为未支付

  - Merge branch 'master' into cc_20260323_minor_req

  - fix:初始化钱包分账信息状态改为未支付

  - fix:钱包线上支付校验使用网商钱包账户

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/72
This commit is contained in:
王非凡
2026-03-24 09:36:35 +00:00
committed by 正新
parent a13ba2175c
commit 1f3d5a0df7
6 changed files with 14 additions and 12 deletions

View File

@@ -1,5 +1,6 @@
package com.cool.store.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,14 +15,13 @@ import lombok.Data;
@Data
public class UserSimpleDTO {
@ApiModelProperty("用户id")
@JsonIgnore
private String userId;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("手机号")
private String mobile;
@JsonIgnore
private String storeId;
public UserSimpleDTO(String userId, String storeId) {

View File

@@ -34,6 +34,7 @@ public class OpportunityListRequest{
@ApiModelProperty("机会点名称")
private String name;
@ApiModelProperty("机会点优先级过滤:`0` 全部,`3` 高,`2` 中,`1` 低")
private Integer level;
}