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 |
|
hufangzhou
|
5c17918739
|
* Fix the extension file of xuanxuan path when loading.
|
2022-03-09 16:02:44 +08:00 |
|
tianshujie
|
eab4c059a3
|
* Finish task #50388.
|
2022-03-09 16:02:00 +08:00 |
|
李玉春
|
074229767b
|
Merge branch 'sprint/187_tianshujie_20531' into 'master'
Sprint/187 tianshujie 20531
See merge request easycorp/zentaopms!2163
|
2022-03-09 07:26:01 +00:00 |
|
tianshujie
|
8cd6a13955
|
* Fix bug #20535.
|
2022-03-09 15:08:17 +08:00 |
|
tianshujie
|
b4c0fff8e0
|
* Fix bug #20531.
|
2022-03-09 14:55:04 +08:00 |
|
王怡栋
|
16e124b865
|
Merge branch 'sprint/187_hufangzhou_50328' into 'master'
* Finish task #50328.
See merge request easycorp/zentaopms!2162
|
2022-03-09 06:11:15 +00:00 |
|
hufangzhou
|
c2129fa980
|
* Finish task #50328.
|
2022-03-09 14:09:56 +08:00 |
|
孙广明
|
166bf4edf8
|
Merge branch 'sprint/187_tianshujie_20530' into 'master'
* Fix bug #20530.
See merge request easycorp/zentaopms!2161
|
2022-03-09 06:04:46 +00:00 |
|
孙广明
|
6bd1fd330c
|
Merge branch 'sprint/187_hufangzhou_makefile' into 'master'
* Adjust the makefile.
See merge request easycorp/zentaopms!2157
|
2022-03-09 06:02:07 +00:00 |
|
tianshujie
|
a349c5bfeb
|
* Fix bug #20530.
|
2022-03-09 14:01:41 +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 |
|
hufangzhou
|
b876d3d981
|
* Adjust the makefile.
|
2022-03-09 13:36:43 +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 |
|