From a40429e0df56c94fecd29dbfb4c99cf2d393a1a8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 11:14:09 +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/vo/TCrmBranchVO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java
index 8b16907..911ab57 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmBranchVO.java
@@ -1,9 +1,13 @@
package com.ruoyi.system.vo;
import com.ruoyi.system.model.TCrmBranch;
+import com.ruoyi.system.model.TCrmBranchArea;
+import com.ruoyi.system.model.TCrmBranchSalary;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
@ApiModel(value = "crm分公司管理VO")
@@ -12,4 +16,10 @@
@ApiModelProperty(value = "省份")
private String provinceName;
+ @ApiModelProperty(value = "省市列表")
+ private List<TCrmBranchArea> crmBranchAreas;
+
+ @ApiModelProperty(value = "职位薪资")
+ private List<TCrmBranchSalary> crmBranchSalaries;
+
}
--
Gitblit v1.7.1