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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-course/src/main/java/com/dsh/course/feignclient/other/model/Store.java

@@ -24,6 +24,10 @@
     */
    private Integer cityManagerId;
    /**
     * 运营商id
     */
    private Integer operatorId;
    /**
     * 省
     */
    private String province;