diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java
index da180c2fdcf6cd88944fb2c3eaf5b39825399449..6b56da41677bf5b0a491e2db8b07823b4c50cf3e 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java
+++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java
@@ -268,4 +268,6 @@ public interface UserMapper {
     void updateUserTokenByUuid(@Param("token") String token, @Param("uuid") String uuid);
 
     void deleteUserDataByUserUuid(String userUuid);
+
+    void deleteUserDataByUserUuidAndType(@Param("userUuid") String userUuid, @Param("type") String type);
 }
diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
index ff4d9e50405745c0745fb9e94aba64cc86c91f5d..1f67f762b83921e9aaf0f35d3007baa3ae547d23 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
@@ -807,7 +807,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
     <select id="getUserDataByUserUuidAndType" parameterType="java.lang.String"
             resultType="neatlogic.framework.dto.UserDataVo" useCache="false">
         SELECT `user_uuid` as userUuid,
-               `data`      as data,
+               `data`      as dataStr,
                `type`      as type
         FROM `user_data`
         where `user_uuid` = #{userUuid}
@@ -1381,7 +1381,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
 
     <insert id="insertUserData" parameterType="neatlogic.framework.dto.UserDataVo">
         INSERT INTO `user_data` (`user_uuid`, `data`, `type`)
-        VALUES (#{userUuid}, #{data}, #{type})
+        VALUES (#{userUuid}, #{dataStr}, #{type})
     </insert>
 
     <!--<insert id="insertUserAgent" parameterType="neatlogic.framework.dto.UserAgentVo">
@@ -1550,7 +1550,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
 
     <update id="updateUserData" parameterType="neatlogic.framework.dto.UserDataVo">
         UPDATE `user_data`
-        SET `data` = #{data}
+        SET `data` = #{dataStr}
         WHERE `user_uuid` = #{userUuid}
           and `type` = #{type}
     </update>
@@ -1670,6 +1670,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         DELETE  FROM `user_data` WHERE `user_uuid` = #{value}
     </delete>
 
+    <delete id="deleteUserDataByUserUuidAndType">
+        DELETE  FROM `user_data` WHERE `user_uuid` = #{userUuid} and `type` = #{type}
+    </delete>
+
     <update id="updateUserTokenByUuid">
         update `user`
         set `token` = #{token}
diff --git a/src/main/java/neatlogic/framework/dto/UserDataVo.java b/src/main/java/neatlogic/framework/dto/UserDataVo.java
index 7260c4fb4334ee3c23c1f893179b7452c59d54fa..529e3bdad98694c0e46ed861069ff851911b288a 100644
--- a/src/main/java/neatlogic/framework/dto/UserDataVo.java
+++ b/src/main/java/neatlogic/framework/dto/UserDataVo.java
@@ -1,25 +1,26 @@
 package neatlogic.framework.dto;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.restful.annotation.EntityField;
 
 public class UserDataVo implements Cloneable{
-	@EntityField(name = "用户uuid",
-			type = ApiParamType.STRING)
+	@EntityField(name = "common.useruuid", type = ApiParamType.STRING)
 	private String userUuid;
-	@EntityField(name = "数据",
-			type = ApiParamType.STRING)
-	private String data;
-	@EntityField(name = "功能类型",
-			type = ApiParamType.STRING)
+	@EntityField(name = "common.data", type = ApiParamType.JSONOBJECT)
+	private JSONObject data;
+	@EntityField(name = "common.type", type = ApiParamType.STRING)
 	private String type;
 
+	@JSONField(serialize = false)
+	private String dataStr;
 
 	public UserDataVo() {
 
 	}
 
-	public UserDataVo(String userUuid, String data, String type) {
+	public UserDataVo(String userUuid, JSONObject data, String type) {
 		this.userUuid = userUuid;
 		this.data = data;
 		this.type = type;
@@ -29,7 +30,10 @@ public class UserDataVo implements Cloneable{
 		return userUuid;
 	}
 
-	public String getData() {
+	public JSONObject getData() {
+		if (data == null && dataStr != null) {
+			data = JSONObject.parseObject(dataStr);
+		}
 		return data;
 	}
 
@@ -41,7 +45,7 @@ public class UserDataVo implements Cloneable{
 		this.userUuid = userUuid;
 	}
 
-	public void setData(String data) {
+	public void setData(JSONObject data) {
 		this.data = data;
 	}
 
@@ -49,6 +53,17 @@ public class UserDataVo implements Cloneable{
 		this.type = type;
 	}
 
+	public String getDataStr() {
+		if (dataStr == null && data != null) {
+			dataStr = data.toJSONString();
+		}
+		return dataStr;
+	}
+
+	public void setDataStr(String dataStr) {
+		this.dataStr = dataStr;
+	}
+
 	public Object clone() throws CloneNotSupportedException{
 	    return super.clone();
 	}