 tanghucheng
|
6056bebedc
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-13 14:38:40 +08:00 |
|
|
wangyidong
|
2bc0a7f4c1
|
* fix for upgrade.
|
2022-07-13 14:21:13 +08:00 |
|
|
朱金勇
|
ca9adecd3f
|
Merge branch 'sprint/xuanxuan_108' into 'master'
合并小喧喧通知卡片相关代码
See merge request easycorp/zentaopms!4452
|
2022-07-13 05:58:05 +00:00 |
|
|
王怡栋
|
70bd6eaa5e
|
Merge branch 'sprint/master_zhouxudong_25163' into 'master'
* Fix bug #25163 #25166 #25170.
See merge request easycorp/zentaopms!4513
|
2022-07-13 05:53:10 +00:00 |
|
|
zhouxudong
|
729a4872ca
|
* Fix bug #25163 #25166 #25170.
|
2022-07-13 05:47:57 +00:00 |
|
|
孙广明
|
10b3d140d2
|
Merge branch 'fixConflict_24687' into 'master'
fixConflict_24687
See merge request easycorp/zentaopms!4512
|
2022-07-13 05:45:00 +00:00 |
|
|
王怡栋
|
42629df5ab
|
Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!4511
|
2022-07-13 05:43:07 +00:00 |
|
|
liumengyi
|
a743cf4b3f
|
* Optimize code.
|
2022-07-13 13:41:48 +08:00 |
|
|
王怡栋
|
7f89cbb52e
|
Merge branch 'sprint/tianshujie_issue' into 'master'
Sprint/tianshujie issue
See merge request easycorp/zentaopms!4510
|
2022-07-13 05:35:22 +00:00 |
|
|
王怡栋
|
e286a450fb
|
Merge branch 'sprint/215_liumengyi_24491' into 'master'
* Fix bug #24491.
See merge request easycorp/zentaopms!4504
|
2022-07-13 05:33:00 +00:00 |
|
|
王怡栋
|
ac29fee89d
|
Merge branch 'sprint/214_hufangzhou_package' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!4508
|
2022-07-13 05:32:31 +00:00 |
|
|
sunjun
|
cf11a3a4fe
|
fixConflict_24687
|
2022-07-13 05:31:43 +00:00 |
|
|
孙广明
|
61125b78b5
|
Merge branch 'sprint/216_mayue_bug24404' into 'master'
Sprint/216 mayue bug24404
See merge request easycorp/zentaopms!4507
|
2022-07-13 05:29:18 +00:00 |
|
|
hufangzhou
|
d133a2b5e8
|
* Add the new version.
|
2022-07-13 13:28:45 +08:00 |
|
|
tianshujie
|
66b29f2881
|
* Resolve issue #690.
|
2022-07-13 13:23:13 +08:00 |
|
|
tanghucheng
|
5fb0364aba
|
* Code for import.
|
2022-07-13 13:19:52 +08:00 |
|
|
tanghucheng
|
6cfd29c5b2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-13 13:19:44 +08:00 |
|
|
tianshujie
|
7ce105940e
|
* Resolve issue #690.
|
2022-07-13 13:17:02 +08:00 |
|
|
孙广明
|
d8e313669e
|
Merge branch 'sprint/211_sunjun_60474' into 'master'
Sprint/211 sunjun 60474
See merge request easycorp/zentaopms!4503
|
2022-07-13 05:10:46 +00:00 |
|
|
liumengyi
|
cc31e0efa0
|
* Fix bug #24491.
|
2022-07-13 13:09:30 +08:00 |
|
|
sunjun
|
0c7767c3c5
|
60474
|
2022-07-13 04:31:32 +00:00 |
|
|
mayue
|
3cfa290a92
|
* Fix bug #24404.
|
2022-07-13 11:31:57 +08:00 |
|
|
王怡栋
|
ec135f3c40
|
Merge branch 'sprint/215_liumengyi_24896' into 'master'
* Fix bug #24896.
See merge request easycorp/zentaopms!4501
|
2022-07-13 03:29:41 +00:00 |
|
|
王怡栋
|
a769590829
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4502
|
2022-07-13 03:29:11 +00:00 |
|
|
tianshujie
|
c52fc59335
|
* Fix bug #25072.
|
2022-07-13 11:26:59 +08:00 |
|
|
liumengyi
|
424653ac7f
|
* Fix bug #24896.
|
2022-07-13 11:23:50 +08:00 |
|
|
王怡栋
|
aa81fd6741
|
Merge branch 'sprint214_leiyong_fix_bug' into 'master'
* Adjust Modified Fields.
See merge request easycorp/zentaopms!4499
|
2022-07-13 03:12:56 +00:00 |
|
|
王怡栋
|
30e7879a41
|
Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!4493
|
2022-07-13 03:12:44 +00:00 |
|
|
lanzongjun
|
818bd7085c
|
* fix task #60360
|
2022-07-13 11:11:57 +08:00 |
|
|
mayue
|
090989e25e
|
* Fix bug #24404.
|
2022-07-13 11:11:36 +08:00 |
|
|
lanzongjun
|
175b5c0669
|
* fix task #60360
|
2022-07-13 11:09:24 +08:00 |
|
|
lanzongjun
|
7637e225d4
|
* fix task #60360
|
2022-07-13 11:08:30 +08:00 |
|
|
leiyong
|
accd4feee5
|
* Adjust Modified Fields.
|
2022-07-13 02:57:28 +00:00 |
|
|
王怡栋
|
975c7cfb3d
|
Merge branch 'master_xieqiyu_25145' into 'master'
* Fix bug#25145.
See merge request easycorp/zentaopms!4498
|
2022-07-13 02:26:05 +00:00 |
|
|
王怡栋
|
0ac2e857a4
|
Merge branch 'sprint214_leiyong_task_60384' into 'master'
Sprint214 leiyong task 60384
See merge request easycorp/zentaopms!4495
|
2022-07-13 02:25:36 +00:00 |
|
|
xieqiyu
|
cdec3750ed
|
* Fix bug#25145.
|
2022-07-13 10:20:03 +08:00 |
|
|
孙广明
|
58a5567ada
|
Merge branch 'sprint_60477' into 'master'
Sprint 60477
See merge request easycorp/zentaopms!4492
|
2022-07-13 02:17:41 +00:00 |
|
|
孙广明
|
1e873272b3
|
Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.
See merge request easycorp/zentaopms!4476
|
2022-07-13 02:17:12 +00:00 |
|
|
孙广明
|
3e03fa9082
|
Merge branch 'sprint/216_mayue_bug#24930' into 'master'
* Fix bug #24930.
See merge request easycorp/zentaopms!4494
|
2022-07-13 02:16:46 +00:00 |
|
|
leiyong
|
5b91324e83
|
* Finish task#60384.
|
2022-07-13 02:15:09 +00:00 |
|
|
孙广明
|
d7999be8bf
|
* Remove sprint create child btn.
|
2022-07-13 10:09:14 +08:00 |
|
|
mayue
|
e3abe64edc
|
* Fix bug #24930.
|
2022-07-13 10:03:51 +08:00 |
|
|
王怡栋
|
65e48dadb8
|
Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.
See merge request easycorp/zentaopms!4487
|
2022-07-13 02:02:44 +00:00 |
|
|
liumengyi
|
be11f49b45
|
* Optimize code.
|
2022-07-13 09:46:02 +08:00 |
|
|
sunjun
|
b905ccead6
|
sprint_60477
|
2022-07-13 01:38:10 +00:00 |
|
|
孙广明
|
f322c472f5
|
Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476.
See merge request easycorp/zentaopms!4491
|
2022-07-13 01:29:02 +00:00 |
|
|
liumengyi
|
7570ab2744
|
* Fix bug for task #60476.
|
2022-07-13 09:09:35 +08:00 |
|
|
tianshujie
|
38325e32a8
|
* Fix bug #22964.
|
2022-07-13 09:05:36 +08:00 |
|
|
孙广明
|
28f6cefe13
|
* Add burn to execution list.
|
2022-07-13 09:00:16 +08:00 |
|
|
孙广明
|
f506169428
|
* Only query active task in execution list.
|
2022-07-13 08:54:39 +08:00 |
|