qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qcast3:23c0b6d24bee64583fad18fd621e6003ea52d019
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
..
compare: qcast3:984cef269585ef16bb40666f0427ea5b90d00f51
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/jp-0331
qcast3:feature/rjy-0430
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
qcast3:main

No commits in common. "23c0b6d24bee64583fad18fd621e6003ea52d019" and "984cef269585ef16bb40666f0427ea5b90d00f51" have entirely different histories.
23c0b6d24b ... 984cef2695

1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -2070,7 +2070,7 @@ public class EstimateService {
+ StringUtils.defaultString(data.getPlanNo()) + ")"); + StringUtils.defaultString(data.getPlanNo()) + ")");
elm = doc.getElementById("objectName5"); elm = doc.getElementById("objectName5");
elm.text(StringUtils.defaultString(data.getObjectName()) + " " + StringUtils.defaultString(data.getObjectNameOmit())); elm.text(StringUtils.defaultString(data.getObjectName()));
elm = doc.getElementById("totVolKw5"); elm = doc.getElementById("totVolKw5");
elm.text(StringUtils.defaultString(data.getTotVolKw()) + " Kw"); elm.text(StringUtils.defaultString(data.getTotVolKw()) + " Kw");