Merge branch 'dev'
This commit is contained in:
commit
7499cbf4a0
|
@ -496,13 +496,13 @@ public class CensusController {
|
||||||
List<String> head0 = new ArrayList<>();
|
List<String> head0 = new ArrayList<>();
|
||||||
head0.add("上架部门");
|
head0.add("上架部门");
|
||||||
List<String> head1 = new ArrayList<>();
|
List<String> head1 = new ArrayList<>();
|
||||||
head0.add("类型");
|
head1.add("类型");
|
||||||
List<String> head2 = new ArrayList<>();
|
List<String> head2 = new ArrayList<>();
|
||||||
head0.add("资源名称");
|
head2.add("资源名称");
|
||||||
List<String> head3 = new ArrayList<>();
|
List<String> head3 = new ArrayList<>();
|
||||||
head0.add("日期");
|
head3.add("日期");
|
||||||
List<String> head4 = new ArrayList<>();
|
List<String> head4 = new ArrayList<>();
|
||||||
head0.add("状态");
|
head4.add("状态");
|
||||||
list.add(head0);
|
list.add(head0);
|
||||||
list.add(head1);
|
list.add(head1);
|
||||||
list.add(head2);
|
list.add(head2);
|
||||||
|
@ -559,15 +559,15 @@ public class CensusController {
|
||||||
List<String> head0 = new ArrayList<>();
|
List<String> head0 = new ArrayList<>();
|
||||||
head0.add("提供部门");
|
head0.add("提供部门");
|
||||||
List<String> head1 = new ArrayList<>();
|
List<String> head1 = new ArrayList<>();
|
||||||
head0.add("资源名称");
|
head1.add("资源名称");
|
||||||
List<String> head2 = new ArrayList<>();
|
List<String> head2 = new ArrayList<>();
|
||||||
head0.add("类型");
|
head2.add("类型");
|
||||||
List<String> head3 = new ArrayList<>();
|
List<String> head3 = new ArrayList<>();
|
||||||
head0.add("申请部门");
|
head3.add("申请部门");
|
||||||
List<String> head4 = new ArrayList<>();
|
List<String> head4 = new ArrayList<>();
|
||||||
head0.add("日期");
|
head4.add("日期");
|
||||||
List<String> head5 = new ArrayList<>();
|
List<String> head5 = new ArrayList<>();
|
||||||
head0.add("状态");
|
head5.add("状态");
|
||||||
list.add(head0);
|
list.add(head0);
|
||||||
list.add(head1);
|
list.add(head1);
|
||||||
list.add(head2);
|
list.add(head2);
|
||||||
|
|
Loading…
Reference in New Issue