From 69fb1df23b8fae9cf9b666badabf5b74239c84e3 Mon Sep 17 00:00:00 2001 From: chj <16637853242@163.com> Date: Wed, 16 Aug 2023 08:56:03 +0800 Subject: [PATCH] =?UTF-8?q?MES=E6=8A=A5=E5=BA=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/mes/config/DynamicDatasource.java | 2 +- .../src/main/resources/mapper/mes/ProEmbryoScrapMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 523a95cc..94868a2f 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 5cd57255..ec8b9502 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