Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/OrgPayAccountService.java

@@ -41,11 +41,15 @@ public class OrgPayAccountService extends SuperService {
      * @param paymentType 支付方式
      * @return
      */
-    public OrgPayAccount queryOgPayAccount(String oid, PaymentType paymentType) {
+    public String queryOgPayAccount(String oid, PaymentType paymentType) {
         OrgPayAccount orgPayAccount = orgPayAccountDao.findTopByOidAndPaymentType(oid, paymentType);
-        return orgPayAccount;
+        if (ObjectUtils.isNotEmpty(orgPayAccount)) {
+            return orgPayAccount.getPayAccountId();
+        }
+        return "";
     }
 
+
     /**
      * 保存项目 微信支付账号
      *