Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-12 85afea4dc14ca9a8a3fcacc447f269089fc953ad

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java

@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -44,6 +45,15 @@
        }
        return R.ok(data);
    }
    @ApiOperation(value = "标签管理列表", tags = {"用户管理-用户标签管理"})
    @GetMapping(value = "/tags/select")
    public R<List<TUserTag>> select() {
        TagListQueryDto tagListQueryDto = new TagListQueryDto();
        tagListQueryDto.setPageCurr(1);
        tagListQueryDto.setPageSize(999);
        R<Page<TUserTag>> pageR = otherClient.queryTagPage(tagListQueryDto);
        return R.ok(pageR.getData().getRecords());
    }


    @ApiOperation(value = "标签添加或修改", tags = {"用户管理-用户标签管理"})

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml

@@ -35,5 +35,6 @@
                and (t1.end_time between #{req.startTime} and #{req.endTime}
            </if>
        </if>
and t1.delete_flag = 0
    </select>
</mapper>