Merge remote-tracking branch 'origin/main'

fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java

@@ -41,7 +41,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
     }
     @Override
     public IPage<FleetMemberVo> queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) {
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+//        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         return baseMapper.queryPageByNameOrMobile(page,fleetMember);
     }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml

@@ -89,10 +89,12 @@
                ig.used_inventory,
                ig.market,
                igc.category_name,
+               ms.name storeName,
         mg.name goodsName
         from integral_gift ig
         left join integral_gift_category igc ON ig.category_id = igc.id
         left join (select * from mt_goods where stock >0) mg ON ig.goods_id = mg.id
+        left join mt_store ms on ig.store_id = ms.id
         <where>
             ig.store_id = #{integralGift.storeId}
             and ig.remaining_inventory >0

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java

@@ -9,6 +9,7 @@ public class IntegralGiftVO extends IntegralGift {
     private String categoryName;
     private String goodsName;
     private Boolean ifRedemptionIsOnline;
+    private String storeName;
     // 商品
     // 优惠卷
 }