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

经销商类型

See merge request quanshu/mp-server!39

mp-service/src/main/java/com/qs/mp/channel/domain/Channel.java

@@ -59,6 +59,7 @@ public class Channel implements Serializable {
    * 经销商类型
    */
   @TableField("site_type")
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private SiteTypeEnum siteType;
 
   /**