 zenggang
|
f072b034f5
|
* Finish task#50669,50670
|
2022-03-15 09:29:20 +00:00 |
|
|
liyuchun
|
16709ce378
|
* Finish task #50659.
|
2022-03-15 16:58:30 +08:00 |
|
|
李玉春
|
072a170a3a
|
Merge branch 'devops24_50694' into 'devops24'
Fix bug#50694,50689
See merge request easycorp/zentaopms!2259
|
2022-03-15 06:24:49 +00:00 |
|
|
zenggang
|
18772de39f
|
* Adjust code
|
2022-03-15 06:19:42 +00:00 |
|
|
zenggang
|
b851915f14
|
* Adjust code
|
2022-03-15 06:10:20 +00:00 |
|
|
zenggang
|
1d4cc3436c
|
* Adjust code
|
2022-03-15 05:55:49 +00:00 |
|
|
zenggang
|
2431e1ccc2
|
* Fix bug#50694,50689
|
2022-03-15 02:56:31 +00:00 |
|
|
孙广明
|
99924a75a5
|
Merge branch 'devops24_liyuchun_50700' into 'devops24'
Fix bug #20743,#20209.
See merge request easycorp/zentaopms!2251
|
2022-03-15 01:40:15 +00:00 |
|
|
liyuchun
|
ab5910454b
|
* Fix bug #20743,#20209.
|
2022-03-15 08:40:33 +08:00 |
|
|
孙广明
|
57651b969a
|
Merge branch 'devops24_liyuchun_50709' into 'devops24'
完成任务#50709
See merge request easycorp/zentaopms!2236
|
2022-03-14 08:44:38 +00:00 |
|
|
liyuchun
|
b25e7a1fe7
|
* Fix bug #20209.
|
2022-03-14 16:38:41 +08:00 |
|
|
李玉春
|
645190c141
|
Merge branch 'devops24_cyy' into 'devops24'
处理bug #50686， #50678， #50668.
See merge request easycorp/zentaopms!2240
|
2022-03-14 08:35:14 +00:00 |
|
|
caoyanyi
|
d1d63da7cb
|
* Adjust code.
|
2022-03-14 16:35:03 +08:00 |
|
|
caoyanyi
|
5777e30c74
|
* Adjust code.
|
2022-03-14 16:34:12 +08:00 |
|
|
caoyanyi
|
6f718185db
|
* Adjust code.
|
2022-03-14 16:32:56 +08:00 |
|
|
caoyanyi
|
f4f64a2ad0
|
* Adjust code.
|
2022-03-14 16:30:40 +08:00 |
|
|
李玉春
|
51eaf6cc23
|
Merge branch 'devops23_cyy_50075' into 'devops24'
Devops23 cyy 50075
See merge request easycorp/zentaopms!2234
|
2022-03-14 08:28:01 +00:00 |
|
|
caoyanyi
|
4973f92006
|
* Add locate url.
|
2022-03-14 16:21:24 +08:00 |
|
|
caoyanyi
|
1c14ab9738
|
* Modify dynamic datas.
|
2022-03-14 16:17:43 +08:00 |
|
|
caoyanyi
|
49e60b7d96
|
* Modify list style.
|
2022-03-14 15:59:40 +08:00 |
|
|
caoyanyi
|
0a2a96915b
|
* Modify default value.
|
2022-03-14 15:59:27 +08:00 |
|
|
liyuchun
|
7d40bdf1d3
|
* Finish task #50709.
|
2022-03-14 15:53:33 +08:00 |
|
|
zhujinyong
|
ea63748351
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 15:12:53 +08:00 |
|
|
zhujinyong
|
976299d506
|
* Fix type of fields.
|
2022-03-14 15:12:32 +08:00 |
|
|
孙广明
|
d1a3c84b57
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2232
|
2022-03-14 06:42:12 +00:00 |
|
|
liumengyi
|
3c75a1555e
|
* Add auto test of task.
|
2022-03-14 14:39:59 +08:00 |
|
|
朱金勇
|
0ba0e25d66
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2230
|
2022-03-14 06:36:24 +00:00 |
|
|
孙广明
|
140c7652ad
|
* Fix upgrade bug.
|
2022-03-14 14:23:19 +08:00 |
|
|
zhujinyong
|
b5da3ce7d5
|
* Execute xuanxuan update sql.
|
2022-03-14 13:55:52 +08:00 |
|
|
朱金勇
|
89aea98b25
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2227
|
2022-03-14 03:32:07 +00:00 |
|
|
孙广明
|
16bfad8acd
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for priv.
See merge request easycorp/zentaopms!2226
|
2022-03-14 03:31:17 +00:00 |
|
|
孙广明
|
1beb9196e3
|
* Fix upgrade bug.
|
2022-03-14 11:30:04 +08:00 |
|
|
tanghucheng
|
4cbe8ae9a2
|
* Fix bug for priv.
|
2022-03-14 11:23:55 +08:00 |
|
|
zhujinyong
|
32d12d4ef2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 10:35:18 +08:00 |
|
|
zhujinyong
|
7a3e077afa
|
* The setting of system.common has no vision.
|
2022-03-14 10:34:47 +08:00 |
|
|
孙广明
|
87458bc808
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20702,20698,20642.
See merge request easycorp/zentaopms!2223
|
2022-03-14 02:13:14 +00:00 |
|
|
孙广明
|
5820a746ba
|
Merge branch 'sprint/187_hufangzhou_20704' into 'master'
* Fix bug #20704.
See merge request easycorp/zentaopms!2224
|
2022-03-14 02:12:35 +00:00 |
|
|
hufangzhou
|
c402f35eda
|
* Fix bug #20704.
|
2022-03-14 10:08:25 +08:00 |
|
|
tanghucheng
|
a25fd822bd
|
* Fix bug #20702,20698,20642.
|
2022-03-14 09:55:44 +08:00 |
|
|
孙广明
|
4806292eff
|
Merge branch 'autotest_denghongtao' into 'master'
Autotest denghongtao
See merge request easycorp/zentaopms!2222
|
2022-03-14 01:28:12 +00:00 |
|
|
[denghongtao]
|
aac3861c31
|
* Add auto test.
|
2022-03-14 09:22:53 +08:00 |
|
|
[denghongtao]
|
5ac561a338
|
Update old test
|
2022-03-14 09:17:47 +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 |
|