Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

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

@@ -120,11 +120,6 @@
    @TableField("welfarePicture")
    private String welfarePicture;
    /**
     * 开始上课图片
     */
    @TableField("classPicture")
    private String classPicture;
    /**
     * 评分
     */
    @TableField("score")
@@ -136,6 +131,10 @@
    private Integer state;


    @TableField("operatorId")
    private Integer operatorId;


    @Override
    protected Serializable pkVal() {
        return this.id;