MES报废功能

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;

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>