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

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html

@@ -48,7 +48,7 @@
                           ng-model="isPrint">
                                 <option value="">--请选择打印状态--</option>
                                 <option value="1">已打印</option>
-                                <option value="-1">未打印</option>
+                                <option value="0">未打印</option>
                             </select>
                    </td>
                    <td >格口:</td>

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js

@@ -86,10 +86,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.orderNumber='';
             }
-            if ($("#print").val() == 1 || $("#print").val() == -1) {
+            if ($("#print").val() == 1 || $("#print").val() == 0) {
                 json.state=$("#print").val();
             }else {
-                json.state='';
+                json.state=-1;
             }
             if (angular.isDefined($scope.gkxx)) {
                 json.latticeMouthInformation = $scope.gkxx