测试git冲突

liurunyu

2023-12-01 43cef17ebd5b267e12fe5aa9c955ef71e9d0f2a4

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoTest.java

@@ -10,7 +10,7 @@
import java.io.Serializable;
import java.util.Date;

@TableName(autoResultMap = true)
@TableName(value="demo_test", autoResultMap = true)
@Data
@Builder
@ToString