用户删除功能优化，添加是否主库字段

src/main/resources/static/app/storage/views/foodbasicinfo/foodCardDetails/foodbasicinfo-central-corn.html

@@ -131,7 +131,7 @@
 										<td style="text-align:center;">
 											收获年度
 										</td>
-										<td>{{foodbasicinfo.growYear}}</td>
+										<td>{{dicData[foodbasicinfo.growYear]}}</td>
 										<td style="text-align:center;">
 											入库时间
 										</td>

src/main/resources/static/app/storage/views/foodbasicinfo/foodCardDetails/foodbasicinfo-central-rice.html

@@ -131,7 +131,7 @@
                                             <td style="text-align:center;">
                                                 收获年度
                                             </td>
-                                            <td>{{foodbasicinfo.growYear}}</td>
+                                            <td>{{dicData[foodbasicinfo.growYear]}}</td>
                                             <td style="text-align:center;">
                                                 入库时间
                                             </td>

src/main/resources/static/app/storage/views/foodbasicinfo/foodCardDetails/foodbasicinfo-central-wheat.html

@@ -131,7 +131,7 @@
                                             <td style="text-align:center;">
                                                 收获年度
                                             </td>
-                                            <td>{{foodbasicinfo.growYear}}</td>
+                                            <td>{{dicData[foodbasicinfo.growYear]}}</td>
                                             <td style="text-align:center;">
                                                 入库时间
                                             </td>

src/main/resources/static/app/system/controller/userCtrl.js

@@ -33,7 +33,7 @@ angular.module('app.system').controller("userCtrl",
 
         // 删除一条记录
         $scope.remove = function(userId) {
-            var flag = confirm("确定要删除吗？");
+            var flag = confirm("确定要删除吗？删除用户会同时删除当前用户对应的员工的信息,请知悉!");
             console.log(flag);
             if (!flag) {
                 return;

src/main/resources/static/app/system/views/org-edit.html

@@ -451,6 +451,16 @@
 									            </span><input type="text" name="birdsRemote" ng-model="orgInfo.birdsRemote" placeholder="" readonly="">
 											</div>
 										</section>
+										<section class="col col-4">
+											<label class="label">是否主库<span style="color: red;">*</span></label>
+											<label class="select"> 
+												<select ng-model="orgInfo.sfzk" name="sfzk" class="form-control" required>
+													<option value="">请选择</option>
+													<option value="0">是</option>
+													<option value="1">否</option>
+												</select><i></i>
+											</label>
+										</section>
 									</div>
 								</fieldset>