# Conflicts:
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerKylinSqlOrderPayRedisStreamConfig.java
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/QueueUtils.java

Pre

See merge request !259

fix:数字藏品名称及副标题~Valid:中英文且允许（首尾不可）包含空格及·;

fix:数字藏品名称及副标题~Valid:允许包含空格（首尾不可）;

fix:数字藏品名称及副标题+Valid:中英文数字;
fix:数字藏品添加SPU数据SQL+author,publisher记录;

config-test

See merge request !258

~queue:ChimeQueue.USER_OPERATION_DISLIKE;

~queue:ChimeQueue.USER_OPERATION_DISLIKE;