 liumengyi
|
201aa2f257
|
* Add auto test of computeHours4Multiple.
|
2022-03-10 14:08:54 +08:00 |
|
|
liumengyi
|
678253cda2
|
* Add auto test for task.
|
2022-03-09 17:15:05 +08:00 |
|
|
孙广明
|
ebfdd2a742
|
Merge branch 'autoTest_liumengyi' into 'master'
* Add auto test for task.
See merge request easycorp/zentaopms!2159
|
2022-03-09 05:53:01 +00:00 |
|
|
liumengyi
|
b1623bb73a
|
* Add auto test for task.
|
2022-03-09 13:46:19 +08:00 |
|
|
王怡栋
|
ac1e9de780
|
Merge branch 'sprint/187_tianshujie_20506' into 'master'
* Fix bug #20506.
See merge request easycorp/zentaopms!2158
|
2022-03-09 05:42:31 +00:00 |
|
|
tianshujie
|
6efc56ebd1
|
* Fix bug #20506.
|
2022-03-09 13:39:35 +08:00 |
|
|
王怡栋
|
e7fff4a211
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug
See merge request easycorp/zentaopms!2154
|
2022-03-09 05:23:40 +00:00 |
|
|
tianshujie
|
e7670ff411
|
* Add spaces.
|
2022-03-09 13:22:43 +08:00 |
|
|
tianshujie
|
e4dba8b073
|
* Modify the code writing logic.
|
2022-03-09 12:40:28 +08:00 |
|
|
王怡栋
|
0529d3b656
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20458,20369,20140,20373.
See merge request easycorp/zentaopms!2153
|
2022-03-09 03:52:04 +00:00 |
|
|
tanghucheng
|
07f2f81d43
|
* Fix bug #20432.
|
2022-03-09 10:55:55 +08:00 |
|
|
王怡栋
|
86c4b382a6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-09 10:53:57 +08:00 |
|
|
王怡栋
|
f5d4dfc9ad
|
* code for task #49356.
|
2022-03-09 10:53:08 +08:00 |
|
|
tianshujie
|
57da5c00a9
|
* Fix bug #20503.
|
2022-03-09 10:47:16 +08:00 |
|
|
tianshujie
|
d6692b22c1
|
* Fix bug #20522.
|
2022-03-09 10:39:45 +08:00 |
|
|
tianshujie
|
234a2352ec
|
* Fix bug #20487.
|
2022-03-09 10:37:10 +08:00 |
|
|
孙广明
|
d7e0c4fd7a
|
Merge branch 'autoTest_liumengyi' into 'master'
* Add auto test.
See merge request easycorp/zentaopms!2152
|
2022-03-09 02:25:05 +00:00 |
|
|
liumengyi
|
29c651b4e8
|
* Modify data.
|
2022-03-09 10:23:32 +08:00 |
|
|
liumengyi
|
9257884f9a
|
* Add auto test.
|
2022-03-09 10:22:01 +08:00 |
|
|
tanghucheng
|
2d3c8464d3
|
* Fix bug #20458,20369,20140,20373.
|
2022-03-09 10:20:46 +08:00 |
|
|
tianshujie
|
06701aa5a0
|
* Fix style issues when raising bugs.
|
2022-03-09 09:34:52 +08:00 |
|
|
李玉春
|
de0d542d01
|
Merge branch 'devops23_zg' into 'master'
调整代码
See merge request easycorp/zentaopms!2149
|
2022-03-09 01:14:31 +00:00 |
|
|
zenggang
|
8eaba29e5f
|
* Adjust code
|
2022-03-09 01:11:39 +00:00 |
|
|
王怡栋
|
b0a00ff547
|
Merge branch 'sgm_checktable' into 'master'
* Code for upgrade check table.
See merge request easycorp/zentaopms!2150
|
2022-03-09 01:05:52 +00:00 |
|
|
孙广明
|
200ba77298
|
* Code for version.
|
2022-03-09 09:04:16 +08:00 |
|
|
tianshujie
|
e1dd273c3c
|
* Modify the add contact popup style.
|
2022-03-09 08:49:13 +08:00 |
|
|
孙广明
|
5ea6b26500
|
* Code for upgrade check table.
|
2022-03-09 08:47:24 +08:00 |
|
|
zenggang
|
515dd085c4
|
* Adjust code
|
2022-03-08 09:40:28 +00:00 |
|
|
王怡栋
|
c753960b31
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #50357
See merge request easycorp/zentaopms!2147
|
2022-03-08 09:19:09 +00:00 |
|
|
Zongjun Lan
|
12245e26a7
|
* fix code format
|
2022-03-08 17:18:05 +08:00 |
|
|
Zongjun Lan
|
d713bf7b1f
|
* fix bug 50357
|
2022-03-08 17:11:52 +08:00 |
|
|
Zongjun Lan
|
b7ba61136e
|
* fix bug 50357
|
2022-03-08 16:32:29 +08:00 |
|
|
zhujinyong
|
27bd1de1d1
|
* Fix code error.
|
2022-03-08 16:22:41 +08:00 |
|
|
王怡栋
|
fb22e1dcb0
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 50368
See merge request easycorp/zentaopms!2128
|
2022-03-08 07:54:22 +00:00 |
|
|
Zongjun Lan
|
64d797b109
|
* fix bug 50368
|
2022-03-08 15:49:39 +08:00 |
|
|
李玉春
|
ad432a9454
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Finish task #50380.
See merge request easycorp/zentaopms!2143
|
2022-03-08 06:38:52 +00:00 |
|
|
tianshujie
|
54ac0f8c8e
|
* Finish task #50380.
|
2022-03-08 13:52:34 +08:00 |
|
|
王怡栋
|
d62013b39f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 13:30:35 +08:00 |
|
|
王怡栋
|
1e8e9d5a45
|
* code for kanban menu.
|
2022-03-08 13:28:48 +08:00 |
|
|
孙广明
|
0c7bb72c10
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Finish task #50303.
See merge request easycorp/zentaopms!2142
|
2022-03-08 05:22:20 +00:00 |
|
|
zhujinyong
|
ec019ab0ab
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 13:16:19 +08:00 |
|
|
zhujinyong
|
89aaefc8c6
|
* Fix upgrade.
|
2022-03-08 13:15:47 +08:00 |
|
|
王怡栋
|
34e744bb23
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 13:03:51 +08:00 |
|
|
王怡栋
|
72d89e3c9f
|
* adjust for buildIndex menu.
|
2022-03-08 13:03:34 +08:00 |
|
|
tianshujie
|
03390a6900
|
* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.
|
2022-03-08 13:01:53 +08:00 |
|
|
孙广明
|
e823f2223c
|
Merge branch 'sprint/187_hufangzhou_makefile' into 'master'
* Need not to merge xuanxuan sql.
See merge request easycorp/zentaopms!2141
|
2022-03-08 03:29:19 +00:00 |
|
|
hufangzhou
|
ee52c0370e
|
* Need not to merge xuanxuan sql.
|
2022-03-08 11:28:16 +08:00 |
|
|
孙广明
|
597124d922
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Modify the upgrade error report.
See merge request easycorp/zentaopms!2139
|
2022-03-08 03:18:31 +00:00 |
|
|
tianshujie
|
01d35645e6
|
* Modify the upgrade error report.
|
2022-03-08 11:17:10 +08:00 |
|
|
朱金勇
|
ec5dade7d6
|
Merge branch 'sgm_upgrade' into 'master'
* Add from version.
See merge request easycorp/zentaopms!2138
|
2022-03-08 03:15:55 +00:00 |
|