Merge branch 'master' into prod

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java

@@ -149,6 +149,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         Map<String, List<OrderDetailPrintVo>> resultMap = new HashMap<>();
         // 遍历订单详情列表
         for (OrderDetailPrintVo orderDetail : orderDetails) {
+            if ("Array".equals(orderDetail.getProGroupInfo())) {
+                orderDetail.setProGroupInfo("[]");
+            }
             orderDetail.initGift();
             // 获取当前订单详情的 placeNum
             Integer placeNum = orderDetail.getPlaceNum();