Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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) {