Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-14 c81d766cd91be3b3a24c8db94dcd93c071a66c62

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java

@@ -51,19 +51,19 @@
    @Autowired
    private GDMapGeocodingUtil gdMapGeocodingUtil;

    @Autowired
    @Resource
    private AppUserClient appClient;

    @Autowired
    @Resource
    private StudentClient studentClient;

    @Autowired
    @Resource
    private CouponMapper couponMapper;

    @Autowired
    @Resource
    private StoreClient storeClient;

    @Autowired
    @Resource
    private CouponStoreMapper csMapper;

    /**