From 2a28984276e51d5f6635f3ae62b982b30c442bfd Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 17 五月 2024 14:40:06 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java b/phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java
index 85a2d9d..1f0e640 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java
@@ -16,15 +16,15 @@
private BigDecimal integral = BigDecimal.ZERO;
/**鐜伴噾*/
private BigDecimal cash = BigDecimal.ZERO;
- /**榛樿鐨勬姷鎵ｆ瘮渚�*/
+ /**榛樿姣斾緥*/
private BigDecimal rate = BigDecimal.ZERO;
/**鏄惁鍚敤*/
private Integer isUp;
/**鏄惁鍏ㄥ钩鍙板彲鐢�,濡傛灉杩欎釜鍊间负0,鍒欏彧鏈夐檺鍒跺钩鍙拌〃limit_common鐨勫钩鍙拌兘浣跨敤銆愮Н鍒嗘姷鎵ｇ幇閲戙�戞敮浠樻柟寮�*/
private Integer isAllPlatform;
- /**鏄惁涓嶉檺鍒堕」鐩�,濡傛灉杩欎釜鍊间负1,鍒欐墍鏈夌殑椤圭洰閮藉彲浠ヤ娇鐢ㄣ�愮Н鍒嗘姷鎵ｇ幇閲戙�戞敮浠樻柟寮�*/
+ /**鏄惁璁剧疆鍏ㄩ儴椤圭洰鎶垫墸,濡傛灉杩欎釜鍊间负0,榛樿鐨勬姷鎵ｆ瘮渚嬪氨鏄�0,濡傛灉鍊间负1,鍒欎娇鐢ㄨ缃殑榛樿姣斾緥*/
private Integer isNoLimit;
- /**鏄惁鏈夐檺鍒堕」鐩�,濡傛灉杩欎釜鍊间负1,鍒欏彧鏈夐檺鍒堕」鐩〃integral_cash_project鐨勯」鐩兘浣跨敤銆愮Н鍒嗘姷鎵ｇ幇閲戙�戞敮浠樻柟寮�*/
+ /**鏄惁鏈夐檺鍒堕」鐩�,濡傛灉杩欎釜鍊间负1,鍒欓檺鍒堕」鐩〃integral_cash_project鐨勯」鐩娇鐢ㄥ悇鑷缃殑姣斾緥*/
private Integer isHaveProjectLimit;
/**姣忎釜SKU鐨勬渶澶ф姷鎵ｆ瘮渚�*/
--
Gitblit v1.8.0