Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/service/CollectionElementService.java
#	src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java

src/main/java/com/ai/da/common/utils/RedisUtil.java

@@ -494,6 +494,7 @@ public class RedisUtil {
         return maxLikeCount != null ? Integer.parseInt(maxLikeCount) : 0;
     }
 
+    public final static String IMAGE_SEGMENTATION = "ImageSegmentation:";
 
     public final static String STRIPE_EXCEPTION_LOG = "StripeException:";