Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-31 758be4456bb88c8c7fd008d1aa38cb64783880ee

 fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDebt.java

@@ -15,7 +15,7 @@
@Table("yeshi_ec_user_debt")

public class UserMoneyDebt {

   public enum UserMoneyDebtTypeEnum {

      hongBao("返利退款"), other("其他");

      order("维权退款"), other("其他");

      private final String desc;



      private UserMoneyDebtTypeEnum(String desc) {