diff --git a/op-modules/op-mes/src/main/java/com/op/mes/config/DynamicDatasource.java b/op-modules/op-mes/src/main/java/com/op/mes/config/DynamicDatasource.java index 523a95cc3..94868a2ff 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/config/DynamicDatasource.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/config/DynamicDatasource.java @@ -26,7 +26,7 @@ import java.util.Map; @Component public class DynamicDatasource { - @Resource + @Autowired private DynamicDatasourceCreator dynamicDatasourceCreator; @Autowired private RemoteUserService remoteUserService; diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml index 5cd57255b..ec8b95027 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml @@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_code, product_desc_zh from - base_product GROUP BY product_id, + base_product GROUP BY product_id, product_code, product_desc_zh