Merge branch '01/06-vipActiveReset' into online

src/views/categroyManager/vipActiveList.vue

@@ -867,8 +867,8 @@ export default {
           let organId = this.resetForm.organ.join(",");
           let type = this.activeType;
           if (type == "DISCOUNT") {
-            if (this.attribute1 < 0 || this.attribute1 > 100) {
-              this.$message.error("折扣必须大于0且小于100");
+            if (this.attribute1 < 0 ) {
+              this.$message.error("折扣必须大于0");
               return;
             }
           }

src/views/categroyManager/vipNewActive.vue

@@ -353,8 +353,8 @@ export default {
           let organId = this.vipform.organ.join(",");
           let type = this.activeType;
           if (type == 'DISCOUNT') {
-            if (this.attribute1 < 0 || this.attribute1 > 100) {
-              this.$message.error('折扣必须大于0且小于100')
+            if (this.attribute1 < 0 ) {
+              this.$message.error('折扣必须大于0')
               return
             }
           }