diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java index 36b68ad..fecac5a 100644 --- a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java +++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java @@ -59,13 +59,13 @@ public class TouPiaoController extends Controller { @IsLoginInterface({}) public void save(String gaoji, String zhongji) { String toupiaoren_tel = getCookie("toupiaoren_tel"); - //检查中级是不是2个,高级是不是3个 + //检查中级是不是2个,高级是不是2个 String[] gaojiArray = gaoji.split(","); String[] zhongjiArray = zhongji.split(","); - if (gaojiArray.length != 3) { + if (gaojiArray.length != 2) { Kv kv = Kv.create(); kv.set("success", false); - kv.set("message", "本次投票高级只能投3人!"); + kv.set("message", "本次投票高级只能投2人!"); renderJson(kv); return; } diff --git a/target/classes/ExcelExportTemplate/excelTemp/21B775AF-4BDC-477E-A75C-72ACC9605087.xls b/target/classes/ExcelExportTemplate/excelTemp/21B775AF-4BDC-477E-A75C-72ACC9605087.xls new file mode 100644 index 0000000..a3d5ef0 Binary files /dev/null and b/target/classes/ExcelExportTemplate/excelTemp/21B775AF-4BDC-477E-A75C-72ACC9605087.xls differ diff --git a/target/classes/ExcelExportTemplate/excelTemp/516B1BFF-7B99-434A-9891-0B101D849BF5.xls b/target/classes/ExcelExportTemplate/excelTemp/516B1BFF-7B99-434A-9891-0B101D849BF5.xls new file mode 100644 index 0000000..32778df Binary files /dev/null and b/target/classes/ExcelExportTemplate/excelTemp/516B1BFF-7B99-434A-9891-0B101D849BF5.xls differ diff --git a/target/classes/ExcelExportTemplate/excelTemp/C69C4528-E20E-476E-8EB5-746956D247F8.xls b/target/classes/ExcelExportTemplate/excelTemp/C69C4528-E20E-476E-8EB5-746956D247F8.xls new file mode 100644 index 0000000..7726e5d Binary files /dev/null and b/target/classes/ExcelExportTemplate/excelTemp/C69C4528-E20E-476E-8EB5-746956D247F8.xls differ diff --git a/一键推拉.cmd b/一键推拉.cmd new file mode 100644 index 0000000..b057324 --- /dev/null +++ b/一键推拉.cmd @@ -0,0 +1,11 @@ +cmdkey /delete:LegacyGeneric:target=git:http://10.10.14.176:3000/ +cmdkey /generic:LegacyGeneric:target=git:http://10.10.14.176:3000/ /user:huanghai /pass:mdcija780522 +cmdkey /list:LegacyGeneric:target=git:http://10.10.14.176:3000/ + +git config --global core.autocrlf false + +git add -A . +git commit -am 'commit' +git pull +::git fetch +git push origin master \ No newline at end of file