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

3ad98caa · 王鑫 · a8606476 · b2c99991 · 3ad98caa
Commit 3ad98caa authored Dec 27, 2021 by 王鑫
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

CHANGELOG.md CHANGELOG.md +7 -0

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## 1.1.0
+`2021-12-24 09:56`<br><br>
+#### 新增功能 
+- feat: 项目成本表添加项目状态 ([bd976fd](http://git.antaikeji.top/zentao/zentao-view/commit/bd976fd9beb3934c19ffb71192970b913047aaa1)) @wangxin 
+#### 修复问题 
+- fix: 排序字段排序 ([c721b7f](http://git.antaikeji.top/zentao/zentao-view/commit/c721b7f9f37ab6e0db158d094eb2f31f25a2bc2e)) @18663304220 
+
 ## 1.0.2
 `2021-04-12 14:58`
 #### 修复问题