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/CoachQuery.java

@@ -13,4 +13,5 @@
    // 编辑页面回显使用
    private Integer id;
    private List<Integer> storeIds;
    private Integer operatorId;
}