Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 8c83fad498da51773d4aa6a4aa6af13f8e39e27d

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

@@ -96,4 +96,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String endTime;
    
    @ApiModelProperty(value = "扩展字段")
    @TableField("extension")
    private String extension;
}