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

admin

2020-03-14 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7

 fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackExchange.java

@@ -12,7 +12,7 @@
 * @author Administrator

 *

 */

@Table("yeshi_red_pack_exchange")

@Table("yeshi_ec_red_pack_exchange")

public class RedPackExchange {

   public static final int STATE_INIT = 0;

   public static final int STATE_SUCCESS = 1;