From 6a069cd871bf0b53768fc9a76a397af709c1deec Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 17:05:55 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java
index ad6ad32..8fa6d9c 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/entity/ServiceSubtaskEntity.java
@@ -99,10 +99,10 @@
private String phone;
/**
- * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+ * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)
*/
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)")
+ @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)")
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)")
private String serviceType;
@ApiModelProperty(value = "鏈嶅姟绫诲瀷闆嗗悎")
--
Gitblit v1.9.3