Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java

@@ -26,8 +26,8 @@ import java.sql.Connection;
 public class WmsSAPDbQuery {
     public static final Logger LOGGER = LoggerFactory.getLogger(WmsSAPDbQuery.class);
     public static boolean needI18N = true;
-    @Resource(name = "wmsDataSource")
+    /*@Resource(name = "wmsDataSource")
-    private DynamicDataSourceProxy wmsDataSourceProxy;
+    private DynamicDataSourceProxy wmsDataSourceProxy;*/
 
     @Resource(name = "mesDataSource")
     private DynamicDataSourceProxy mesDataSourceProxy;