Merge branch 'pre' into 'master'

~api:批量导入商品:商品ID生成逻辑调整;

See merge request !326

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsImportService.java

@@ -353,7 +353,7 @@ public class GoblinStoreMgtGoodsImportService {
     private GoblinGoodsInfoVo goodsInformationDataAnalysisProcessingForSpu(GoblinGoodsImportDto dt, String uid, String storeId, LocalDateTime now) {
         GoblinGoodsInfoVo lastGoodsInfoVo = GoblinGoodsInfoVo.getNew();
         lastGoodsInfoVo.setName(dt.getSpuName());//*
-        lastGoodsInfoVo.setSpuId(IDGenerator.nextMilliId2());//*
+        lastGoodsInfoVo.setSpuId(IDGenerator.nextSnowId());//*
         if (StringUtils.isNotEmpty(dt.getSpuCode())) {
             lastGoodsInfoVo.setSpuNo(dt.getSpuCode());
         } else {