Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

2 天以前 2329f548c36876a59a7808e8c96466e94e088350

 src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java

@@ -37,7 +37,7 @@

    @ApiModelProperty(value = "租户ID，用于多租户隔离")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
    private Integer tenantId;
    private Long tenantId;

    @ApiModelProperty(value = "软删除标志，0=未删除，1=已删除")
    private Integer deleted;