anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码冲突

Browse Source
This commit is contained in:
zhouyahui 2018-08-24 12:40:44 +08:00
parent 4a2fac8c4d
commit 2626867d05
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/init/InitDocListTools.java
View File

@ -148,7 +148,10 @@ public class InitDocListTools {
: customerInfo.getAttribute("CUSTOMERTYPE")
.toString();
}
other.put("customerType", customerType);
for (int i = 0; i < 10; i++)
ARE.getLog().info("customerType:"+customerType);
other.put("CustomerType", customerType);
@SuppressWarnings("deprecation")
Configure CurConfig = Configure.getInstance();
// 判断是否存在，不存在就从配置表倒到临时表

3
src_core/com/tenwa/doc/action/DocListInitAction.java
View File

@ -85,10 +85,7 @@ public class DocListInitAction {
relativeid = rela.getAttribute("id").getString();
for (int i = 0; i < 10; i++)
ARE.getLog().info("relativeid:"+relativeid);
<<<<<<< HEAD
=======
>>>>>>> branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git
List<BizObject> configList = configBm.createQuery(
"doc_Class_Itemno in (" + docno + ")").getResultList(false);
for (BizObject config : configList) {