Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 2f25addfcf7393879e899831d4e6c28d220a431b

 server/service/src/main/java/com/doumee/dao/business/model/Shop.java

@@ -244,6 +244,10 @@
    @TableField(exist = false)
    private BigDecimal distance;

    @ApiModelProperty(value = "距离显示", example = "1")
    @TableField(exist = false)
    private String distanceStr;

    @ApiModelProperty(value = "门店导购列表 ", example = "1")
    @TableField(exist = false)
    private List<Users> usersList;