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

无关风月

4 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java

@@ -107,6 +107,9 @@
                        case 3:
                            coupon.setTypeValue("体验券");
                            break;
                            case 4:
                            coupon.setTypeValue("抵扣券");
                            break;
                    }
                    switch (coupon.getUserPopulation()){
                        case 1:
@@ -204,6 +207,9 @@
                        case 3:
                            coupon.setTypeValue("体验券");
                            break;
                        case 4:
                            coupon.setTypeValue("抵扣券");
                            break;
                    }
                    switch (coupon.getUserPopulation()){
                        case 1: