Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 425501a2e9202068f980a63a1d20fdd637bb152c

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java

@@ -163,9 +163,6 @@
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "店长姓名")
    @TableField(exist = false)
    private String managerName;


}