 liumengyi
|
79598fa2f7
|
* Add auto test.
|
2022-03-11 10:52:13 +08:00 |
|
|
孙广明
|
c98a11da7a
|
Merge branch 'autotest_ly' into 'master'
Add execution test
See merge request easycorp/zentaopms!2189
|
2022-03-10 07:19:40 +00:00 |
|
|
liyang
|
6c50fffa51
|
Add execution test
|
2022-03-10 15:15:47 +08:00 |
|
|
孙广明
|
394c6886ab
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of computeHours4Multiple.
See merge request easycorp/zentaopms!2188
|
2022-03-10 07:00:26 +00:00 |
|
|
liumengyi
|
74ad0e261b
|
* Add teamtask.yaml.
|
2022-03-10 14:58:09 +08:00 |
|
|
朱金勇
|
6efc1fad24
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade error.
See merge request easycorp/zentaopms!2185
|
2022-03-10 06:21:24 +00:00 |
|
|
王怡栋
|
7ca513e84b
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-03-10 14:17:01 +08:00 |
|
|
sgm0422
|
ca5624db56
|
* Fix upgrade error.
|
2022-03-10 14:16:48 +08:00 |
|
|
王怡栋
|
9f177b0c85
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/dept/model.php
|
2022-03-10 06:15:21 +00:00 |
|
|
Zongjun Lan
|
7af31d0356
|
* fix bug #20472
|
2022-03-10 14:13:34 +08:00 |
|
|
liumengyi
|
201aa2f257
|
* Add auto test of computeHours4Multiple.
|
2022-03-10 14:08:54 +08:00 |
|
|
孙广明
|
86bc5e14ea
|
Merge branch 'sprint/187_hufangzhou_mySetMenu' into 'master'
* Remove the unused code.
See merge request easycorp/zentaopms!2180
|
2022-03-10 03:19:27 +00:00 |
|
|
孙广明
|
208f4f211d
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Fix bug #15980.
See merge request easycorp/zentaopms!2181
|
2022-03-10 03:18:56 +00:00 |
|
|
tianshujie
|
11d4052d8e
|
* Fix bug #15980.
|
2022-03-10 11:15:16 +08:00 |
|
|
hufangzhou
|
57bbeeddd7
|
* Remove the unused code.
|
2022-03-10 11:01:21 +08:00 |
|
|
朱金勇
|
e591bf4c98
|
Merge branch 'sgm_upgrade' into 'master'
* Add pro upgrade to biz.
See merge request easycorp/zentaopms!2179
|
2022-03-10 02:46:36 +00:00 |
|
|
sgm0422
|
479a6f5575
|
* Add pro upgrade to biz.
|
2022-03-10 10:42:29 +08:00 |
|
|
孙广明
|
cc0ae84104
|
Merge branch 'master_xieqiyu_bug#50418' into 'master'
* Fix bug#16424,#20555.
See merge request easycorp/zentaopms!2178
|
2022-03-10 02:37:42 +00:00 |
|
|
王怡栋
|
01f6eb4cc3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 10:36:40 +08:00 |
|
|
xieqiyu
|
e8a7995351
|
* Fix bug#16424,#20555.
|
2022-03-10 10:32:41 +08:00 |
|
|
王怡栋
|
53c2dd44fb
|
* fix bug #20113.
|
2022-03-10 10:31:10 +08:00 |
|
|
朱金勇
|
9fb53de457
|
Merge branch 'sgm_upgrade' into 'master'
Sgm upgrade
See merge request easycorp/zentaopms!2177
|
2022-03-10 02:30:28 +00:00 |
|
|
sgm0422
|
bc8e061128
|
* Fix upgrade error.
|
2022-03-10 10:20:45 +08:00 |
|
|
孙广明
|
dc1b86402a
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug
See merge request easycorp/zentaopms!2175
|
2022-03-10 02:15:13 +00:00 |
|
|
Zongjun Lan
|
35037714b5
|
* fix bug #20472
|
2022-03-10 10:13:36 +08:00 |
|
|
tianshujie
|
a0e7c613f3
|
* Finish task #50370.
|
2022-03-10 10:11:56 +08:00 |
|
|
tianshujie
|
a7d66c5fae
|
* Fix bug #20572.
|
2022-03-10 10:05:34 +08:00 |
|
|
sgm0422
|
1748b61779
|
* Fix upgrade error.
|
2022-03-10 10:01:08 +08:00 |
|
|
朱金勇
|
8a9d8c5a24
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2174
|
2022-03-10 01:50:14 +00:00 |
|
|
sgm0422
|
b2d61cc993
|
* Fix upgrade bug.
|
2022-03-10 09:45:30 +08:00 |
|
|
tianshujie
|
c7c06be02a
|
* Fix bug #20561.
|
2022-03-10 09:42:35 +08:00 |
|
|
孙广明
|
7a1b0de4c6
|
Merge branch 'sprint/187_tianshujie_20090' into 'master'
* Fix bug #20090.
See merge request easycorp/zentaopms!2173
|
2022-03-10 01:09:03 +00:00 |
|
|
tianshujie
|
2629c804dc
|
* Change the upgrade program to SQL.
|
2022-03-10 08:55:36 +08:00 |
|
|
李玉春
|
46a625ad24
|
Merge branch 'devops23_20464' into 'master'
bug 20464
See merge request easycorp/zentaopms!2171
|
2022-03-10 00:53:50 +00:00 |
|
|
zenggang
|
549ab5e98f
|
* Adjust code
|
2022-03-10 00:53:15 +00:00 |
|
|
tianshujie
|
546ae70c0d
|
* Fix bug #20090.
|
2022-03-10 08:44:31 +08:00 |
|
|
zenggang
|
41e2e45e8a
|
* Fix bug#20464
|
2022-03-09 09:27:42 +00:00 |
|
|
孙广明
|
d28a3b2f39
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test for task.
See merge request easycorp/zentaopms!2170
|
2022-03-09 09:17:55 +00:00 |
|
|
王怡栋
|
a906254ba5
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20476 #20475
See merge request easycorp/zentaopms!2165
|
2022-03-09 09:15:06 +00:00 |
|
|
liumengyi
|
678253cda2
|
* Add auto test for task.
|
2022-03-09 17:15:05 +08:00 |
|
|
王怡栋
|
a57b4c19cb
|
Merge branch 'sprint/187_hufangzhou_20442' into 'master'
* Fix bug #20442.
See merge request easycorp/zentaopms!2169
|
2022-03-09 09:14:23 +00:00 |
|
|
hufangzhou
|
9eb99fed12
|
* Fix bug #20442.
|
2022-03-09 17:13:18 +08:00 |
|
|
孙广明
|
e80534e80a
|
Merge branch 'autotest_ly' into 'master'
Add kanban data
See merge request easycorp/zentaopms!2168
|
2022-03-09 09:09:11 +00:00 |
|
|
liyang
|
df4497c890
|
Add kanban data
|
2022-03-09 17:05:24 +08:00 |
|
|
李玉春
|
a944fe18f5
|
Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie
See merge request easycorp/zentaopms!2166
|
2022-03-09 08:25:00 +00:00 |
|
|
zhujinyong
|
1076396a79
|
* Refactor upgrade.
|
2022-03-09 16:20:53 +08:00 |
|
|
Zongjun Lan
|
81851a3648
|
* fix bug #20476 #20475
|
2022-03-09 16:18:01 +08:00 |
|
|
tianshujie
|
ffd4850a9d
|
* Finish task #20479.
|
2022-03-09 16:17:32 +08:00 |
|
|
tianshujie
|
1afb4315be
|
* Finish task #50389.
|
2022-03-09 16:06:41 +08:00 |
|
|
王怡栋
|
155092bd49
|
Merge branch 'sprint/187_hufangzhou_makefilexuan' into 'master'
* Fix the extension file of xuanxuan path when loading.
See merge request easycorp/zentaopms!2164
|
2022-03-09 08:04:20 +00:00 |
|