Merge remote-tracking branch 'origin/div' into div

admin

2020-03-01 c5f54810f60e036317562b1b42cfeafd18e984c5

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgDeviceReadState.java

@@ -10,7 +10,7 @@
 */

@Table("yeshi_ec_msg_device_read_state")

public class MsgDeviceReadState {

   public static String TYPE_ZHUSHOU = "zhushou";// 返利券小助手

   public static String TYPE_ZHUSHOU = "zhushou";// 板栗快省小助手

   public static String TYPE_RECOMMEND = "recommend";// 推荐

   public static String TYPE_KEFU = "kefu";