From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
index 998d9d4..0689674 100755
--- a/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java
@@ -7,13 +7,13 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.account.AccountDto;
import com.java110.dto.store.StoreDto;
-import com.java110.dto.workflow.WorkflowDto;
+import com.java110.dto.oaWorkflow.WorkflowDto;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.po.account.AccountPo;
import com.java110.po.org.OrgPo;
import com.java110.po.org.OrgStaffRelPo;
import com.java110.po.store.*;
-import com.java110.po.workflow.WorkflowPo;
+import com.java110.po.oaWorkflow.WorkflowPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
@@ -386,13 +386,14 @@
JSONArray account = new JSONArray();
AccountPo accountPo = new AccountPo();
accountPo.setAcctId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_acctId));
+
accountPo.setAcctName(businessStoreObj.getString("name"));
accountPo.setAcctType(acctType);
accountPo.setAmount("0");
accountPo.setObjId(paramInJson.getString("storeId"));
accountPo.setObjType(AccountDto.OBJ_TYPE_STORE);
account.add(JSONObject.parseObject(JSONObject.toJSONString(accountPo)));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(WorkflowPo.class.getSimpleName(), account);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(AccountPo.class.getSimpleName(), account);
return business;
}
--
Gitblit v1.8.0