From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java
index fa81fd9..18fb878 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java
@@ -52,7 +52,7 @@
@ExcelColumn(name = "绫诲瀷", index = 2, width = 10, valueMapping = "0=灏卞湴瀛樺彇瑙勫垯;1=寮傚湴瀛樺彇瑙勫垯;2=棰勮澶辨晥;3=闂ㄥ簵娉ㄥ唽鎶奸噾;4=鍒嗘垚姣斾緥;")
private Integer type;
- @ApiModelProperty(value = "鍙傛暟1锛歵ype 锛�0/1锛�= 鍏宠仈 鐗╁搧灏哄锛坈ategory type =4锛�;type 锛�2锛�= 榛樿 1 锛� type (3) = 浼佷笟绫诲瀷锛�0=浼佷笟锛�1=涓汉锛夛紱type (4) = 绫诲瀷锛堜紒涓�/涓汉/閰嶉�佸憳锛�")
+ @ApiModelProperty(value = "鍙傛暟1锛歵ype 锛�0/1锛�= 鍏宠仈 鐗╁搧灏哄锛坈ategory type =4锛�;type 锛�2锛� 锛堥粯璁� 1鏍囬�熻揪锛�2=鏋侀�熻揪锛� 锛� type (3) = 浼佷笟绫诲瀷锛�0=浼佷笟锛�1=涓汉锛夛紱type (4) = 绫诲瀷锛堜紒涓�/涓汉/閰嶉�佸憳锛�")
private String fieldA;
@ApiModelProperty(value = "鍙傛暟2锛歵ype 锛�0锛�= 鏀惰垂鍗曚环 ;type 锛�1锛�= 閰嶉�佽捣姝ラ噷绋嬪叕閲屾暟 锛泃ype 锛�2锛�= 璧烽�侀噷绋� km 锛� type (3) = 鎶奸噾锛泃ype (4) = 鍦扮偣绫诲瀷锛堝瘎浠剁偣/鍙栦欢鐐�/鍒嗘垚姣斾緥锛�")
--
Gitblit v1.9.3