Merge remote-tracking branch 'origin/master'

admin

2018-12-12 dc73adfa9d92d11d1a8512778deacc34fa877eef

 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -42,7 +42,6 @@
   public final static String HB_STATEEXCEPTION = "红包状态异常";

   public final static String HB_NOEXIST = "红包不存在";

   public static final int MR_COUNT = 2;

   public static final String HONGBAO_GOODS_PROPORTION = "hongbao_goods_proportion";



   public final static String BA_EXIST = "该类型账户已存在";

   public final static String BA_SUCCESS = "创建成功";