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

admin

2019-12-03 8d38972b593b5ba698b0e605039ed8c795eaaef5

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

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

 *

 */

@Table("yeshi_red_pack_balance")

@Table("yeshi_ec_red_pack_balance")

public class RedPackBalance {

   // 用户id

   @Column(name = "rpb_uid")