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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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

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

 *

 */

@Table("yeshi_red_pack_detail")

@Table("yeshi_ec_red_pack_detail")

public class RedPackDetail {

   public enum RedPackDetailTypeEnum {

      refund("红包退回", "http://img.flqapp.com/img/tlj/icon_tlj.png"),