Merge branch 'master_member_level_feature' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

@@ -83,4 +83,9 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "大图标")
 	private String bigIcon;
 
+
+	@Column(name = "item_img")
+	@ApiModelProperty(value = "会员商品图片")
+	private String itemImg;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -84,6 +84,7 @@ public class AppUserDTO {
 	//图标
 	private String icon;
 	private String bigIcon;
+	private String itemImg;
 	private Integer memberNo;
 	private Long cardLeave;
 	private Integer isBind;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -154,6 +154,7 @@ public class AppUserController extends CommonBaseController{
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
                     userDTO.setBigIcon(memberLevel.getBigIcon());
+                    userDTO.setItemImg(memberLevel.getItemImg());
                 }
             }
         }