jiangjiazhi / regional-platform

Authored by dongqin over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 22 additions and 0 deletions

...	...	@@ -246,6 +246,16 @@
246	246	private String jzsInfo;
247	247
248	248
	249	+ private String ypglx;
	250	+
	251	+ public String getYpglx() {
	252	+ return ypglx;
	253	+ }
	254	+
	255	+ public void setYpglx(String ypglx) {
	256	+ this.ypglx = ypglx;
	257	+ }
	258	+
249	259	public String getSieveType() {
250	260	return sieveType;
251	261	}

...	...	@@ -876,6 +876,7 @@
876	876	result.put("ytxbzl", sieveApply.getYtxbzl());
877	877	result.put("gxbzl", sieveApply.getGxbzl());
878	878	result.put("jzsInfo", sieveApply.getJzsInfo());
	879	+ result.put("ypglx", sieveApply.getYpglx());
879	880
880	881	if (type == 1) {
881	882	result.put("couponCode", couponService.findByUsedId(sieveApply.getId()));

...	...	@@ -250,6 +250,16 @@
250	250	*/
251	251	private String jzsInfo;
252	252
	253	+ private String ypglx;
	254	+
	255	+ public String getYpglx() {
	256	+ return ypglx;
	257	+ }
	258	+
	259	+ public void setYpglx(String ypglx) {
	260	+ this.ypglx = ypglx;
	261	+ }
	262	+
253	263	@Override
254	264	public SieveApplyOrderModel convertToDataModel() {
255	265	SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel();
...	...	@@ -310,6 +320,7 @@
310	320	sieveApplyOrderModel.setYtxbzl(ytxbzl);
311	321	sieveApplyOrderModel.setGxbzl(gxbzl);
312	322	sieveApplyOrderModel.setJzsInfo(jzsInfo);
	323	+ sieveApplyOrderModel.setYpglx(ypglx);
313	324
314	325	return sieveApplyOrderModel;
315	326	}