Browse Source

Merge remote-tracking branch 'origin/master' into prod

Conflicts:
	src/main/java/com/goafanti/common/model/Achievement.java
wanghui 8 years ago
parent
commit
cba0394fe2
1 changed files with 1 additions and 0 deletions
  1. 1 0
      src/main/java/com/goafanti/common/model/Achievement.java

+ 1 - 0
src/main/java/com/goafanti/common/model/Achievement.java

@@ -739,6 +739,7 @@ public class Achievement {
 		this.internationalFlag = internationalFlag;
 	}
 
+	@JsonFormat(shape = Shape.STRING)
 	public Integer getJmrhFlag() {
 		return jmrhFlag;