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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SiteBookingQuery.java

@@ -1,5 +1,6 @@
package com.dsh.guns.modular.system.model;

import io.swagger.models.auth.In;
import lombok.Data;

import java.math.BigDecimal;
@@ -16,5 +17,6 @@
    private BigDecimal amount;
    // 用户ids
    private List<Integer> userIds;

    // 门店ids
    private List<Integer> storeIds;
}