Merge branch 'dev' into 'mp-server-test'

反序列化

See merge request quanshu/mp-server!213

mp-common/src/main/java/com/qs/mp/common/enums/SiteTypeEnum.java

@@ -1,13 +1,16 @@
 package com.qs.mp.common.enums;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONType;
 import com.baomidou.mybatisplus.annotation.IEnum;
+import com.qs.mp.common.json.EnumValueDeserializer;
 
 /**
  *
  * 经销商门店类型
  *
  */
+@JSONType(deserializer = EnumValueDeserializer.class)
 public enum SiteTypeEnum implements IEnum<Integer> {
 
   STREET_STORE(1, "临街门店"),