Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
50,592 Commits 2 Branches 292 Tags
85bcf30edfb46899df3b498d8ba00aaf58e7d014
Commit Graph
1216 Commits
Author SHA1 Message Date
tanghucheng 0d4ae4ba95 * Fix language. 2023-01-03 13:42:04 +08:00
tanghucheng d837ce9ac4 * Fix code style. 2022-12-30 14:09:00 +08:00
tanghucheng 720365e1e2 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2022-12-30 14:03:21 +08:00
zhaoke e095b605f5 * Fix bug. 2022-12-30 05:54:20 +00:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
tanghucheng e1162e3582 * Fix bug . 2022-12-29 15:37:36 +08:00
田淑杰 866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
tanghucheng fa37b1a503 * Add start and close pri. 2022-12-29 13:59:02 +08:00
田淑杰 f18c9b655e * Fix bug #29041. 2022-12-26 10:27:25 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
liugang 0257517d94 * Add privilege control of screen. 2022-12-23 14:53:28 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
tanghucheng a454682370 * Finish task #78643. 2022-12-14 14:16:49 +08:00
孙广明 81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
tanghucheng e11ec7993c Merge branch 'zenops_46' into sprint/220 2022-12-09 13:49:30 +08:00
tanghucheng 185d280025 * Code for task #78645. 2022-12-06 17:25:03 +08:00
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46' 
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
 2022-11-28 06:58:42 +00:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
caoyanyi 7272593f0b Merge branch 'master' into sprint/220 2022-11-25 13:52:26 +08:00
liugang da3e57db0f * Display all reports by report-preview function. 2022-11-24 13:23:37 +08:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
zenggang a0bda0eaa0 * Adjust code 2022-11-23 02:56:57 +00:00
zenggang 748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +00:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
wangyuting 532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
zenggang 1c69f30793 * Adjust code 2022-11-16 02:08:00 +00:00
zenggang 921de5b4f1 * Fix feedback#1452 2022-11-16 01:13:55 +00:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
wangyuting 29bb8e22b6 * Add project build priv. 2022-11-10 07:40:52 +00:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
王怡栋 9bacba7388 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239' 
* Adjust devops priv.

See merge request easycorp/zentaopms!6002
 2022-11-03 05:26:02 +00:00
wangyuting2 c2db7a96a9 * Adjust devops priv. 2022-11-03 00:51:27 +00:00
王怡栋 e7aa768496 Merge branch 'zentaopms_239_task#74239' into 'zentaopms_239' 
* Finish task #74239.

See merge request easycorp/zentaopms!5992
 2022-11-02 07:52:28 +00:00
wangyuting2 6209c70d7e * Finish task #74239. 2022-11-02 07:42:06 +00:00
wangyuting2 4d63abcce5 * Fix caselib bug. 2022-11-02 07:18:06 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyuting2 dc4716f951 * Finish task #73845 ~ #73848. 2022-11-02 06:05:18 +00:00
wangyuting2 d54ca95ff6 * Finish task #73838 ~ #73844. 2022-11-02 01:15:40 +00:00
tanghucheng e403ddec67 * Add group. 2022-11-01 15:16:09 +08:00
wangyuting2 95a2e3da68 * Finish task #73828. 2022-10-31 06:08:56 +00:00
zenggang a4a217c64d * Fix bug #29089 2022-10-28 08:34:37 +00:00
wangyuting2 b7ebe4ee2b * Optimize code. 2022-10-28 08:05:21 +00:00
wangyuting2 fc95cc66a0 * Optimize code. 2022-10-27 06:46:57 +00:00
wangyuting2 5467991e67 * Finish task #73814. 2022-10-27 06:10:54 +00:00