Merge remote-tracking branch 'origin/master'

platform-admin/src/main/webapp/js/sys/attributes.js

@@ -15,14 +15,15 @@ $(function () {
 			// 	}},
 			{label: '是否开启', name: 'status', index: 'status', width: 80,formatter:function (value, grid, rows){
 					let returnStr;
-					if (value == '0') {
+					if (value == '1') {
 						returnStr = "<i-button class=\"ivu-btn ivu-btn-primary\"  style='border-radius:25px;' type=\"info\">已开启</i-button>";
-					} else if (value == '1') {
+					} else if (value == '0') {
 						returnStr = "<i-button class=\"ivu-btn ivu-btn-success\"  style='border-radius:25px;' type=\"warning\">未开启</i-button>";
 					}
 					return returnStr;
 				}},
 			{label: '是否必填', name: 'need', index: 'need', width: 80,formatter:function (value, grid, rows){
+					console.log(value)
 					let returnStr;
 					if (value == false) {
 						returnStr = "<i-button class=\"ivu-btn ivu-btn-primary\"  style='border-radius:25px;' type=\"info\">非必填</i-button>";