Merge pull request '多语言支持' (#247) from feature/dxf into develop

Reviewed-on: #247

src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java

@@ -61,7 +61,7 @@ public class StaffPlanTableVO {
     /**
      * 年度
      */
-    @OrganizationTableColumn(labelId = 546937, text = "年度", width = "16%", column = "plan_year")
+    @OrganizationTableColumn(labelId = 547336, text = "年度", width = "16%", column = "plan_year")
     private Integer planYear;
     /**
      * 时间开始

src/com/engine/organization/service/impl/StaffPlanServiceImpl.java

@@ -129,7 +129,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         // 名称
         SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "planName");
         // 年度
-        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 546937, "planYear");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547336, "planYear");
         planYearItem.setFormat("YYYY");
         // 时间开始
         SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547337, "timeStart");
@@ -174,7 +174,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547141, "planName");
         planNameItem.setRules("required|string");
         // 年度
-        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 546937, "planYear");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 547336, "planYear");
         planYearItem.setFormat("YYYY");
         planYearItem.setRules("required|string");
         // 时间开始