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

yujian

2020-05-14 4397fa6607ac892fa86c9d6e73dc9bbd94d0df7b

 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";