分支合并
This commit is contained in:
@@ -431,6 +431,7 @@ public class SendOutManageServiceImpl implements SendOutManageService {
|
|||||||
|
|
||||||
if (ObjectUtil.isNotEmpty(isBlock2)) {
|
if (ObjectUtil.isNotEmpty(isBlock2)) {
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
JSONObject jsonNewRow = JSONObject.parseObject(JSON.toJSONString(rowPointList.get(0)));
|
JSONObject jsonNewRow = JSONObject.parseObject(JSON.toJSONString(rowPointList.get(0)));
|
||||||
point_code4 = jsonNewRow.getString("point_code");
|
point_code4 = jsonNewRow.getString("point_code");
|
||||||
|
|||||||
Reference in New Issue
Block a user