Merge branch 'gift_card_func' into pre

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2218,7 +2218,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					GiftCardUserRecord giftCardUserRecord = new GiftCardUserRecord();
 					String gcDetail;
 					if (data.getGcType() == 1) {
-						gcDetail = String.format("现金卡%s", data.getCash().divide(BigDecimal.valueOf(100)));
+						gcDetail = String.format("现金卡%s%s", data.getCash().divide(BigDecimal.valueOf(100)), Constant.CN_CYS);
 						giftCardUserRecord.setCash(data.getCash());
 						giftCardUserRecord.setRemainCash(data.getCash());
 					} else {