Merge remote-tracking branch 'origin/master'

xuhy

2024-10-14 e9f36d42efaa757c7f93b00ba3ff9fb0d0bf46c9

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserMapVO.java

@@ -11,6 +11,7 @@
public class TCharingUserMapVO {
    @ApiModelProperty("上分折线图")
    private List<Map<String,Object>> map;
    private List<Map<String,Object>> map1;
    @ApiModelProperty("用户标签")
    private List<Map<String,Object>> userMaps;
    @ApiModelProperty("单位消费")