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

优化

See merge request quanshu/mp-server!944

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

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