Merge branch '01/06-vipActiveReset' into online

src/views/categroyManager/vipActiveList.vue

@@ -867,7 +867,7 @@ export default {
           let organId = this.resetForm.organ.join(",");
           let type = this.activeType;
           if (type == "DISCOUNT") {
-            if (this.attribute1 < 0 ) {
+            if (this.attribute1 < 0 ) { // 勇哥要求将折扣设置大于100%
               this.$message.error("折扣必须大于0");
               return;
             }

src/views/categroyManager/vipNewActive.vue

@@ -353,7 +353,7 @@ export default {
           let organId = this.vipform.organ.join(",");
           let type = this.activeType;
           if (type == 'DISCOUNT') {
-            if (this.attribute1 < 0 ) {
+            if (this.attribute1 < 0 ) { // 勇哥要求将折扣设置大于100%
               this.$message.error('折扣必须大于0')
               return
             }