Commit Graph
35237 Commits
Author SHA1 Message Date
Zongjun Lan 5be25315f3 * fix bug #19535 2022-03-15 11:10:30 +08:00
Zongjun Lan e9806c290e * fix bug #19430 2022-03-14 16:42:46 +08:00
Zongjun Lan 3d936d7dc8 * fix bug #20703 2022-03-14 15:43:15 +08:00
孙广明 94068dcb1f Merge branch 'sprint/187_hufangzhou_20665' into 'master'
* Fix bug #20665.

See merge request easycorp/zentaopms!2221
2022-03-14 01:08:47 +00:00
hufangzhou 8187472563 * Fix bug #20665. 2022-03-14 09:06:42 +08:00
王怡栋 7fd6757311 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Modify the problem that the execution label cannot be fully displayed.

See merge request easycorp/zentaopms!2220
2022-03-14 00:58:01 +00:00
tianshujie 56c5c966ea * Modify the problem that the execution label cannot be fully displayed. 2022-03-14 08:55:39 +08:00
孙广明 04493aa3af Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for feedback.

See merge request easycorp/zentaopms!2219
2022-03-14 00:33:41 +00:00
tanghucheng f90bdb2a0c * Fix bug for feedback. 2022-03-14 08:32:03 +08:00
王怡栋 49218a4097 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* code format

See merge request easycorp/zentaopms!2215
2022-03-14 00:26:35 +00:00
zhujinyong ee8298f9f6 * Check login. 2022-03-13 23:57:59 +08:00
zhujinyong 87909913c8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-13 22:42:56 +08:00
朱金勇 9851110785 Merge branch 'sprint/187_hufangzhou_zentaosql' into 'master'
* Add the functions to zentao.sql .

See merge request easycorp/zentaopms!2218
2022-03-13 14:32:46 +00:00
zhujinyong 7f32ac7f61 * Fix error when updating. 2022-03-13 22:30:40 +08:00
hufangzhou 9a3d7b3a1f * Add the functions to zentao.sql . 2022-03-13 22:30:12 +08:00
朱金勇 2b429cc75b Merge branch 'sprint/187_hufangzhou_sql' into 'master'
* Modify the default value of visions field.

See merge request easycorp/zentaopms!2217
2022-03-13 13:07:23 +00:00
hufangzhou e91c1acbb7 * Modify the default value of visions field. 2022-03-13 19:31:51 +08:00
zhujinyong 12ed4a79b3 * Fix upgrade. 2022-03-13 19:19:13 +08:00
朱金勇 ceb1df9bdc Merge branch 'sgm_waterfall' into 'master'
* Fix weekly bug.

See merge request easycorp/zentaopms!2216
2022-03-13 11:01:04 +00:00
孙广明 6a6af4e1a2 * Fix weekly bug. 2022-03-13 15:08:54 +08:00
Zongjun Lan 9b8f238779 * code format 2022-03-11 17:31:31 +08:00
王怡栋 e56cf08647 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20640,#20647

See merge request easycorp/zentaopms!2210
2022-03-11 09:29:56 +00:00
Zongjun Lan 22c49a0949 * fix bug #20647 2022-03-11 16:29:00 +08:00
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
Zongjun Lan af893de5d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-03-11 15:06:54 +08:00
zenggang d89efc7087 * Add unit data 2022-03-11 07:04:57 +00:00
Zongjun Lan b51e39e69f * fix bug #20640 2022-03-11 14:58:39 +08: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