Merge branch 'st_identity' into pre

netflix-dao/src/main/java/com/cyksj/model/views/UserActivityView.java

@@ -42,6 +42,12 @@ public class UserActivityView {
 	@DbField("ua.coupon_ids")
 	private String couponIds;
 
+	@DbField("ua.img")
+	private String img;
+
+	@DbField("ua.rules")
+	private String rules;
+
 	@DbIgnore
 	private List<CouponView> couponViews;
 }