Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

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

@@ -19,7 +19,7 @@
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableId(value = "id", type = IdType.INPUT)
    private Integer id;
    /**
     * 门店id