From 5dcd6447f315e821727508cd26bf05f8220b39c8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 四月 2026 13:54:47 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访

---
 smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java
index 8bccb60..b0c5792 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java
@@ -41,6 +41,20 @@
     @ApiModelProperty("闂嵎棰樼洰id")
     private Long topicid;
 
+
+    /**
+     * 闂绫诲瀷锛堜緥濡�,闂ㄨ瘖婊℃剰搴︼細mzmyd     浣忛櫌婊℃剰搴︼細zymyd  ...锛�
+     */
+    @Excel(name = "闂绫诲瀷锛堜緥濡�,闂ㄨ瘖婊℃剰搴︼細mzmyd     浣忛櫌婊℃剰搴︼細zymyd  ...锛�")
+    @ApiModelProperty("闂绫诲瀷锛堜緥濡�,闂ㄨ瘖婊℃剰搴︼細mzmyd     浣忛櫌婊℃剰搴︼細zymyd  ...锛�")
+    private String type;
+
+    /**
+     * 瀛愬璞�
+     */
+    @ApiModelProperty("瀛愬璞¢泦")
+    private List<SvyLibScriptCategory> svyLibScriptCategoryList = new ArrayList<>();
+
     /**
      * 鐖禝D
      */
@@ -67,11 +81,5 @@
     @Excel(name = "鍖婚櫌鏈烘瀯id")
     @ApiModelProperty("鍖婚櫌鏈烘瀯id")
     private String orgid;
-
-    /**
-     * 瀛愬璞�
-     */
-    @ApiModelProperty("瀛愬璞¢泦")
-    private List<SvyLibScriptCategory> svyLibScriptCategoryList = new ArrayList<>();
 
 }

--
Gitblit v1.9.3