fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java

@@ -13,9 +13,9 @@
@AllArgsConstructor
public enum ProcessCategoryEnum {
    CATEGORY0(0, "错误分类"),
    CATEGORY1(1, "入户调查"),
    CATEGORY2(2, "价格评估"),
    CATEGORY3(3, "协议签订"),
    CATEGORY1(1, "合同新增审批"),
    CATEGORY2(2, "合同签订审批"),
    CATEGORY3(3, "合同提前终止审批"),
    ;