解决git冲突

liurunyu

2024-07-25 a37271af0a5a2eb04ca23c80cca32567c968fa8e

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrGroupUnit.java

@@ -69,9 +69,5 @@
    private Date operateDt;


    /**
     * 逻辑删除标识;0-未删除，1-删除
     */
    @Schema(description = "删除标识", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Byte deleted;

}