* Merge code.

This commit is contained in:
孙广明
2021-10-09 13:56:42 +08:00
parent e23e7975a3
commit bb268a2bf6
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -29,12 +29,12 @@ fields:
</div>
- field: begin
note: "开始日期"
range: "(-10M)-(-7M):30D"
range: "(-10M)-(-7M):7D"
type: timestamp
format: "YYYY-MM-DD"
- field: end
note: "结束日期"
range: "(-6M)-(-1M):30D"
range: "(-6M)-(+6M):7D"
type: timestamp
format: "YYYY-MM-DD"
- field: order
@@ -42,4 +42,4 @@ fields:
value: "$id * 5"
- field: deleted
note: "是否删除"
range: 0{119},1
range: 0{359},1
+1 -1
View File
@@ -17,7 +17,7 @@ $builder->company = array('rows' => 1, 'data' => array('company'));
$builder->user = array('rows' => 346, 'data' => array('user'));
$builder->usergroup = array('rows' => 349, 'data' => array('usergroup'));
$builder->product = array('rows' => 200, 'data' => array('product'));
$builder->productplan = array('rows' => 120, 'data' => array('productplan'));
$builder->productplan = array('rows' => 360, 'data' => array('productplan'));
$builder->branch = array('rows' => 160, 'data' => array('branch'));
$builder->build = array('rows' => 8, 'data' => array('build'));