From 9c302dc54f22e274eabc7ec3189aa1e217430944 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 十月 2025 11:52:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java
index ff5db11..8ab15ef 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java
@@ -7,7 +7,7 @@
import javax.validation.constraints.NotNull;
@Data
-@ApiModel("分公司管理员-首页统计第二部分Query")
+@ApiModel("分公司管理员-首页统计第三部分Query")
public class BranchAdminStatisticsThreeQuery {
@ApiModelProperty("1:今天 2：昨日 3:最近7天 4:最近半年 5：最近一年")
@NotNull(message = "请选择时间类型")
@@ -15,4 +15,7 @@
@ApiModelProperty("药品名称")
private String name;
+
+ @ApiModelProperty("分公司id")
+ private String branchId;
}
--
Gitblit v1.7.1