Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-20 875de0f786639bc089ff54aeb9a2fcabdf5f832b

 src/main/java/com/mzl/flower/service/payment/RedisLockService.java

@@ -16,6 +16,7 @@
    private RedisTemplate<String, String> redisTemplate;

    public static final String LOCK_KEY_PAYMENT_NOTIFY_ = "LOCK_KEY_PAYMENT_NOTIFY_";
    public static final String LOCK_KEY_CART_ = "LOCK_KEY_CART_";

    public boolean getObjectLock(String key, String objectId){
        String kk = key + objectId;