Merge remote-tracking branch 'origin/master'

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiFsBusinessRealServiceImpl.java

@@ -2,6 +2,7 @@ package com.lideeyunji.core.framework.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lideeyunji.core.framework.entity.GrBiFsBusinessReal;
@@ -27,6 +28,7 @@ public class GrBiFsBusinessRealServiceImpl extends ServiceImpl<GrBiFsBusinessRea
 
 
     @Override
+    @DSTransactional
     @DS(value = "#dataSourceType")
     public void generateBusinessReal(String dataSourceType) {
         //获取本地mysql数据库中表中UPDATE_TIME最新的数据

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiStLotServiceImpl.java

@@ -2,6 +2,7 @@ package com.lideeyunji.core.framework.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lideeyunji.core.framework.entity.GrBiStLot;
 import com.lideeyunji.core.framework.mapper.GrBiStLotMapper;
@@ -24,6 +25,7 @@ public class GrBiStLotServiceImpl extends ServiceImpl<GrBiStLotMapper, GrBiStLot
 {
 
     @Override
+    @DSTransactional
     @DS(value = "#dataSourceType")
     public void generateStLot(String dataSourceType) {
         //获取本地mysql数据库中表中UPDATE_TIME最新的数据

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiStProductAvlServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lideeyunji.core.framework.entity.GrBiStProduct;
 import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
@@ -25,6 +26,7 @@ public class GrBiStProductAvlServiceImpl extends ServiceImpl<GrBiStProductAvlMap
 {
 
     @Override
+    @DSTransactional
     @DS(value = "#dataSourceType")
     public void generateStProductAvl(String dataSourceType) {
         //获取本地mysql数据库中表中UPDATE_TIME最新的数据

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrBiStProductServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lideeyunji.core.framework.entity.GrBiStProduct;
 import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
@@ -24,6 +25,7 @@ import com.lideeyunji.core.framework.service.IGrBiStProductService;
 public class GrBiStProductServiceImpl extends ServiceImpl<GrBiStProductMapper, GrBiStProduct> implements IGrBiStProductService
 {
     @Override
+    @DSTransactional
     @DS(value = "#dataSourceType")
     public void generateStProduct(String dataSourceType) {
         //获取本地mysql数据库中表中UPDATE_TIME最新的数据