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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

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

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java

@@ -189,6 +189,9 @@
            BeanUtils.copyProperties(worldCupStore,worldCupStoreVO);
            // 查询世界杯活动名称
            WorldCup byId = worldCupService.getById(worldCupStore.getWorldCupId());
            if (byId==null){
                continue;
            }
            if (byId.getStatus()==3 || byId.getStatus()==4){
                continue;
            }

 cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java

@@ -23,7 +23,8 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_store_other_config_true")
public class TStoreOtherConfigTrue extends Model<TStoreOtherConfigTrue> {
public class
TStoreOtherConfigTrue extends Model<TStoreOtherConfigTrue> {

    private static final long serialVersionUID = 1L;