冲突

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -7991,7 +7991,8 @@ public class WmsEnumUtil {
     public enum BH_SUMMARY_IS_SYNC {
         INIT(10, "INIT", "初始化"),
         WAIT_SYNC(20, "WAIT_SYNC", "待同步"),
-        FINISH_SYNC(30, "FINISH_SYNC", "已同步");
+        FINISH_SYNC(30, "FINISH_SYNC", "已同步"),
+        OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步");
 
         private int value;
         private String code;

sonar-project.properties

@@ -6,7 +6,11 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
+<<<<<<< HEAD
 sonar.projectVersion=1.0-DEV-SNAPSHOT
+=======
+sonar.projectVersion=1.0-TEST-SNAPSHOT
+>>>>>>> test
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./