Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java

@@ -242,6 +242,7 @@ public class BasicBackUpdateProductService {
                         udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
                         udiRelevanceEntity1.setUpdateTime(new Date());
                         udiRelevanceEntity1.setModifyTime(new Date());
+                        udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
                         udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
                     }
                 }