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

优化

See merge request quanshu/mp-server!942

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

@@ -1,7 +1,9 @@
 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;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -10,6 +12,7 @@ import io.swagger.annotations.ApiModel;
  * @date 2022/8/4
  */
 @ApiModel("盲票关联商品枚举")
+@JSONType(deserializer = EnumValueDeserializer.class)
 public enum TicketBoxGoodsTypeEnum implements IEnum<String> {