fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java

@@ -46,8 +46,6 @@
    @ApiModelProperty(value = "流水状态 1=正常 2=异常")
    private Integer flowStatus;

    @ApiModelProperty(value = "流水类型 1=系统 2=银行")
    private Integer flowType;

    @ApiModelProperty(value = "支付方式 1=微信支付 2=支付宝支付 3=线下支付")
    private Integer payType;