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

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

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

@@ -22,7 +22,7 @@
   public final static int STATE_SX = 4;// 未付款/已退款



   public enum MsgTypeOrderTypeEnum {

      fanli("返利订单"), share("分享订单"), invite("邀请订单"), found("订单找回");

      fanli("返利订单"), share("分享订单"), invite("邀请订单"), found("订单找回"), elme("饿了么订单");

      private final String desc;



      private MsgTypeOrderTypeEnum(String desc) {