2024-01-20 朱宝民 用户实体类id改为userId

Administrator

2024-01-20 d4fabb188a2426c3e0a0d13074c81c7b9f54ca97

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java

@@ -12,5 +12,6 @@
        System.out.println("test32");
        System.out.println("test33");
        System.out.println("test34");
        System.out.println("test33");
    }
}