From 9ab75540bc4ff97f5f909ace44bdbeacf67cf971 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 18 四月 2024 14:43:03 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' 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;
-    /**榛樿鐨勬姷鎵f瘮渚�*/
+    /**榛樿姣斾緥*/
     private BigDecimal rate = BigDecimal.ZERO;
     /**鏄惁鍚敤*/
     private Integer isUp;
     /**鏄惁鍏ㄥ钩鍙板彲鐢�,濡傛灉杩欎釜鍊间负0,鍒欏彧鏈夐檺鍒跺钩鍙拌〃limit_common鐨勫钩鍙拌兘浣跨敤銆愮Н鍒嗘姷鎵g幇閲戙�戞敮浠樻柟寮�*/
     private Integer isAllPlatform;
-    /**鏄惁涓嶉檺鍒堕」鐩�,濡傛灉杩欎釜鍊间负1,鍒欐墍鏈夌殑椤圭洰閮藉彲浠ヤ娇鐢ㄣ�愮Н鍒嗘姷鎵g幇閲戙�戞敮浠樻柟寮�*/
+    /**鏄惁璁剧疆鍏ㄩ儴椤圭洰鎶垫墸,濡傛灉杩欎釜鍊间负0,榛樿鐨勬姷鎵f瘮渚嬪氨鏄�0,濡傛灉鍊间负1,鍒欎娇鐢ㄨ缃殑榛樿姣斾緥*/
     private Integer isNoLimit;
-    /**鏄惁鏈夐檺鍒堕」鐩�,濡傛灉杩欎釜鍊间负1,鍒欏彧鏈夐檺鍒堕」鐩〃integral_cash_project鐨勯」鐩兘浣跨敤銆愮Н鍒嗘姷鎵g幇閲戙�戞敮浠樻柟寮�*/
+    /**鏄惁鏈夐檺鍒堕」鐩�,濡傛灉杩欎釜鍊间负1,鍒欓檺鍒堕」鐩〃integral_cash_project鐨勯」鐩娇鐢ㄥ悇鑷缃殑姣斾緥*/
     private Integer isHaveProjectLimit;
 
     /**姣忎釜SKU鐨勬渶澶ф姷鎵f瘮渚�*/

--
Gitblit v1.8.0