 zhujinyong
|
abb301884f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 15:55:03 +08:00 |
|
|
zhujinyong
|
bebc33acb4
|
* Fix bug#20651.
|
2022-03-11 15:54:36 +08:00 |
|
|
孙广明
|
3a491529c7
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2213
|
2022-03-11 07:50:07 +00:00 |
|
|
tanghucheng
|
fb78d74984
|
* Fix bug.
|
2022-03-11 15:48:25 +08:00 |
|
|
zhujinyong
|
ad46d46e81
|
* Fix comment.
|
2022-03-11 15:28:43 +08:00 |
|
|
孙广明
|
350c5207cc
|
Merge branch 'autotest_ly' into 'master'
update project data
See merge request easycorp/zentaopms!2212
|
2022-03-11 07:25:22 +00:00 |
|
|
孙广明
|
8b1c98b575
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix sql for lite grouppriv.
See merge request easycorp/zentaopms!2205
|
2022-03-11 07:24:33 +00:00 |
|
|
孙广明
|
a541af7376
|
更新db/zentao.sql
|
2022-03-11 07:24:09 +00:00 |
|
|
tanghucheng
|
c81a8d5edf
|
* Fix bug.
|
2022-03-11 15:21:29 +08:00 |
|
|
liyang
|
fd6e64ec62
|
update project data
|
2022-03-11 15:14:53 +08:00 |
|
|
李玉春
|
aa90a5b118
|
Merge branch 'devops23_zg_unit' into 'master'
增加测试数据
See merge request easycorp/zentaopms!2211
|
2022-03-11 07:10:22 +00:00 |
|
|
tanghucheng
|
cd84fb4d54
|
* Fix bug.
|
2022-03-11 15:09:17 +08:00 |
|
|
zenggang
|
d89efc7087
|
* Add unit data
|
2022-03-11 07:04:57 +00:00 |
|
|
孙广明
|
9a68909f50
|
Merge branch 'sprint/187_hufangzhou_xuanSql' into 'master'
* Add the xuan sql when upgrade.
See merge request easycorp/zentaopms!2208
|
2022-03-11 06:58:27 +00:00 |
|
|
hufangzhou
|
8114d5cdec
|
* Rename executeXuanxuan to executedXuanxuan.
|
2022-03-11 14:57:04 +08:00 |
|
|
孙广明
|
1df0cc1df8
|
Merge branch 'sprint/187_tianshujie_20594' into 'master'
* Fix bug #20594.
See merge request easycorp/zentaopms!2209
|
2022-03-11 06:53:00 +00:00 |
|
|
tianshujie
|
e20c497d01
|
* Fix bug #20678.
|
2022-03-11 14:51:33 +08:00 |
|
|
tianshujie
|
e0f54aedf2
|
* Fix bug #20676.
|
2022-03-11 14:46:26 +08:00 |
|
|
tianshujie
|
2e3438edfc
|
* Modify the code.
|
2022-03-11 14:43:18 +08:00 |
|
|
hufangzhou
|
73bf39d688
|
* Add the xuan sql when upgrade.
|
2022-03-11 14:40:01 +08:00 |
|
|
tianshujie
|
c353ff2b06
|
* Fix bug #20594.
|
2022-03-11 14:38:31 +08:00 |
|
|
王怡栋
|
951fdbc1b6
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20652,#20511,#20643
See merge request easycorp/zentaopms!2187
|
2022-03-11 06:31:15 +00:00 |
|
|
tanghucheng
|
2cfd68b216
|
* Fix sql for lite grouppriv.
|
2022-03-11 14:28:42 +08:00 |
|
|
孙广明
|
99c23e96e2
|
Merge branch 'sprint/187_hufangzhou_sqlField' into 'master'
* Remove the unused code.
See merge request easycorp/zentaopms!2206
|
2022-03-11 06:18:15 +00:00 |
|
|
hufangzhou
|
2d88fc4785
|
* Remove the unused code.
|
2022-03-11 14:16:30 +08:00 |
|
|
tanghucheng
|
b164bc829b
|
* Fix sql for lite grouppriv.
|
2022-03-11 14:15:44 +08:00 |
|
|
孙广明
|
63786c575d
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2204
|
2022-03-11 06:08:38 +00:00 |
|
|
王怡栋
|
28a244d9a2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 14:06:23 +08:00 |
|
|
孙广明
|
bed6d563b4
|
Merge branch 'devops23_liyuchun' into 'master'
* Adjust sonarqube issue link.
See merge request easycorp/zentaopms!2201
|
2022-03-11 06:06:19 +00:00 |
|
|
王怡栋
|
f1f208db64
|
* fix bug #20669.
|
2022-03-11 14:06:04 +08:00 |
|
|
tanghucheng
|
477e89a09e
|
* Fix bug.
|
2022-03-11 14:03:30 +08:00 |
|
|
孙广明
|
7b27a47e10
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test for processTask and processTasks.
See merge request easycorp/zentaopms!2203
|
2022-03-11 06:03:26 +00:00 |
|
|
liumengyi
|
5a26608197
|
* Add auto test for processTask and processTasks.
|
2022-03-11 14:00:07 +08:00 |
|
|
Zongjun Lan
|
1c518b7a9b
|
* fix bug #20643
|
2022-03-11 13:27:29 +08:00 |
|
|
liyuchun
|
4165274307
|
* Adjust sonarqube issue link.
|
2022-03-11 13:22:37 +08:00 |
|
|
王怡栋
|
4deae7dc79
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 13:16:46 +08:00 |
|
|
王怡栋
|
1e7e9f961b
|
* fix bug #20675.
|
2022-03-11 13:16:27 +08:00 |
|
|
孙广明
|
3eb78e6a7e
|
Merge branch 'sprint/187_tianshujie_20656' into 'master'
* Fix bug #20656.
See merge request easycorp/zentaopms!2198
|
2022-03-11 03:18:17 +00:00 |
|
|
tianshujie
|
45a8e7f9fe
|
* Fix bug #20406.
|
2022-03-11 11:16:16 +08:00 |
|
|
孙广明
|
ef5dfd283d
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test.
See merge request easycorp/zentaopms!2197
|
2022-03-11 03:06:12 +00:00 |
|
|
liumengyi
|
52e7c1015e
|
* Modify code format.
|
2022-03-11 10:57:33 +08:00 |
|
|
tianshujie
|
b9366903dc
|
* Fix bug #20656.
|
2022-03-11 10:57:18 +08:00 |
|
|
liumengyi
|
79598fa2f7
|
* Add auto test.
|
2022-03-11 10:52:13 +08:00 |
|
|
Zongjun Lan
|
cb8f6ca375
|
* fix bug #20652
|
2022-03-11 10:38:23 +08:00 |
|
|
王怡栋
|
7f8d7c6593
|
* fix bug #20490.
|
2022-03-11 10:26:33 +08:00 |
|
|
王怡栋
|
7f533c6a68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 10:04:11 +08:00 |
|
|
王怡栋
|
8053903ba2
|
* code for task #20556.
|
2022-03-11 10:03:48 +08:00 |
|
|
孙广明
|
5084aea498
|
Merge branch 'autotest_ly' into 'master'
Add execution
See merge request easycorp/zentaopms!2195
|
2022-03-11 01:29:48 +00:00 |
|
|
liyang
|
681ac8cd7d
|
Add execution
|
2022-03-11 09:24:33 +08:00 |
|
|
朱金勇
|
148f093d38
|
Merge branch 'sgm_upgrade' into 'master'
* Code for upgrade bug.
See merge request easycorp/zentaopms!2194
|
2022-03-11 01:20:40 +00:00 |
|