shiyang / regional-platform

Download as
Browse Code ยป

Commit b6a6d95f752ad935e337c937d2c3fe28bda2a7bb

Authored by baohanddd
2 parents e7af0dc8c7 dca10b3fa9
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java View file @ b6a6d95
... ... @@ -123,8 +123,8 @@
123 123 }
124 124 setPhone(model.getPhone());
125 125 setId(model.getId());
126   -// setCardNo(null==model.getCardNo()?"":model.getCardNo());
127   - setCardNo(null==model.getPhone()?"":model.getPhone());
  126 + setCardNo(null==model.getCardNo()?"":model.getCardNo());
  127 +// setCardNo(null==model.getPhone()?"":model.getPhone());
128 128 setDeliverOrg(model.getDeliverOrg()==null?"":model.getDeliverOrg());
129 129 setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
130 130 setDueType(model.getDueType()==null?"":model.getDueType());
... ... @@ -142,8 +142,7 @@
142 142 }
143 143 setPhone(model.getMphone());
144 144 // setId(model.getId());
145   -// setCardNo(null==model.getCardNo()?"":model.getCardNo());
146   - setCardNo(null==model.getMphone()?"":model.getMphone());
  145 + setCardNo(null==model.getCardNo()?"":model.getCardNo());
147 146 setDueDate(DateUtil.getyyyy_MM_dd(model.getBirth()));
148 147 setName(model.getMname());
149 148 }