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

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

 fanli/src/main/java/com/yeshi/fanli/entity/shop/ChargeTypeEnum.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.entity.shop;



public enum ChargeTypeEnum {

   qq("QQ号", "请输入常用QQ号码充值"), phone("手机号码", "请输入常用手机号");

   qq("QQ", "请输入常用QQ号码充值"), phone("手机号", "请输入常用手机号");

   

   private final String name;

   private final String desc;