MES报废功能

1 year ago · 69fb1df23b
parent efb0b151b9
commit 69fb1df23b
2 changed files with 2 additions and 2 deletions
--- 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;
--- 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
 	</select>