Commit b411d723 authored by hezhen's avatar hezhen

Merge branch 'master-chw' into dev-chw

parents 21f9a503 6d5550af
...@@ -24,7 +24,7 @@ public class VehicleApplyVo extends VehicleApply { ...@@ -24,7 +24,7 @@ public class VehicleApplyVo extends VehicleApply {
public String getBrandName(){ public String getBrandName(){
if (StringUtils.isNotBlank(brandName)){ if (StringUtils.isBlank(brandName)){
String changeJson = this.getChangeJson(); String changeJson = this.getChangeJson();
if (StringUtils.isNotBlank(changeJson)){ if (StringUtils.isNotBlank(changeJson)){
JSONObject jsonObject = JSONObject.parseObject(changeJson); JSONObject jsonObject = JSONObject.parseObject(changeJson);
...@@ -36,7 +36,7 @@ public class VehicleApplyVo extends VehicleApply { ...@@ -36,7 +36,7 @@ public class VehicleApplyVo extends VehicleApply {
public String getCategoryName(){ public String getCategoryName(){
if (StringUtils.isNotBlank(categoryName)){ if (StringUtils.isBlank(categoryName)){
String changeJson = this.getChangeJson(); String changeJson = this.getChangeJson();
if (StringUtils.isNotBlank(changeJson)){ if (StringUtils.isNotBlank(changeJson)){
JSONObject jsonObject = JSONObject.parseObject(changeJson); JSONObject jsonObject = JSONObject.parseObject(changeJson);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment