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

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java

@@ -92,7 +92,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                 String currencyCode = "";
                 String poolname = CONN_TYPE.ebuilder.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql("select currencyCode e10_common.dbo.from uf_eas_currency where id=" + map.get("BZ"), poolname);
+                rs.executeSql("select currencyCode from e10_common.dbo.uf_eas_currency where id=" + map.get("BZ"), poolname);
                 while (rs.next()) {
                     currencyCode = rs.getString("currencyCode");
                     logger_c29b3679.info( "currencyCode--" + currencyCode) ;