Merge remote-tracking branch 'origin/dev' into dev

nightFragrance-massage/src/main/java/com/ylx/giftCard/service/impl/GiftCardOrderServiceImpl.java

@@ -238,7 +238,7 @@ public class GiftCardOrderServiceImpl extends ServiceImpl<GiftCardOrderMapper, G
      */
     private void setUserInfo(GiftCardOrder order, WxLoginUser wxLoginUser) {
         order.setUserId(wxLoginUser.getId());
-        order.setUserName(wxLoginUser.getUsername());
+        order.setUserName(wxLoginUser.getCNickName());
         order.setUserPhone(wxLoginUser.getCPhone());
     }