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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 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;