From d88a0a8d9d8cd11cea0f7c7df17fcaa01da85510 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 十二月 2025 18:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java
index 9c4c13f..2e1f24a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmBranchQuery.java
@@ -34,8 +34,12 @@
@ApiModelProperty(value = "分公司id，前端忽略")
private List<String> branchIds;
+ @ApiModelProperty(value = "分公司id，前端忽略")
+ private List<String> branchIdList;
- @ApiModelProperty(value = "角色类型")
+ @ApiModelProperty(value = "角色类型 前端忽略")
private Integer roleType;
+ @ApiModelProperty(value = "角色类型 前端忽略")
+ private Long userId;
}
--
Gitblit v1.7.1