wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
liumengyi
|
0159cabcff
|
* Fix bug #29272.
|
2022-11-07 09:05:56 +08:00 |
|
tianshujie
|
26efc38fbb
|
* Fix bug #29293.
|
2022-11-04 15:54:29 +08:00 |
|
mayue
|
2be0a1f96c
|
* Optimize code.
|
2022-11-04 09:57:30 +08:00 |
|
mayue
|
4e87bd0ffa
|
* Fix bug #29238 and finsih feedback#1339.
|
2022-11-04 09:49:33 +08:00 |
|
李玉春
|
314f82091d
|
Merge branch 'cyy_project' into 'master'
* Modify project icon.
See merge request easycorp/zentaopms!5960
|
2022-11-01 07:09:55 +00:00 |
|
caoyanyi
|
13f53cc5bc
|
* Fix bug #28998.
|
2022-11-01 14:28:03 +08:00 |
|
hufangzhou
|
402d4a6333
|
* Handle feedback #1304.
|
2022-10-31 07:31:00 +00:00 |
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
tianshujie
|
354e8c129b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247
|
2022-10-26 08:42:00 +08:00 |
|
zenggang
|
1e22332937
|
* Fix bug#28886
|
2022-10-25 01:02:04 +00:00 |
|
tianshujie
|
cda753b5d1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247
|
2022-10-20 08:54:08 +08:00 |
|
tianshujie
|
80f9e9ab61
|
* Fix bug #28499.
|
2022-10-19 15:34:54 +08:00 |
|
tianshujie
|
8eda9a7f8c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247
|
2022-10-19 13:46:43 +08:00 |
|
tianshujie
|
8bbf77788a
|
* Finish task #72348.
|
2022-10-18 14:34:29 +08:00 |
|
wangyidong
|
91ae21caec
|
Merge branch 'master' into sprint/feedback_module
|
2022-10-11 09:33:25 +08:00 |
|
wangyuting2
|
aa9bc2b8ec
|
* Fix systemMode bug.
|
2022-10-10 07:32:11 +00:00 |
|
tianshujie
|
e9ebed5a6e
|
* Finish task #71904.
|
2022-10-10 11:28:31 +08:00 |
|
wangyidong
|
a51f42e7b8
|
* code for task #71609.
|
2022-10-10 09:08:28 +08:00 |
|
liuyongkai
|
6422b24d96
|
* Resolve feedback #938.
|
2022-10-08 01:40:04 +00:00 |
|
wangyidong
|
fd1c722af1
|
* fix bug #28075.
|
2022-09-30 14:58:57 +08:00 |
|
wangyidong
|
9b403e8b64
|
* fix bug #28075.
|
2022-09-30 14:20:53 +08:00 |
|
孙广明
|
9c5e3353e6
|
Merge branch 'lyk_27556' into 'master'
* Fix bug #27556.
See merge request easycorp/zentaopms!5615
|
2022-09-29 06:43:24 +00:00 |
|
liuyongkai
|
11448f3cee
|
* Fix bug #27556.
|
2022-09-29 06:39:47 +00:00 |
|
liuyongkai
|
2b815f88c1
|
* Fix bug #27556.
|
2022-09-29 06:09:50 +00:00 |
|
王怡栋
|
fe8d365582
|
Merge branch 'master_27982' into 'master'
Master 27982
See merge request easycorp/zentaopms!5602
|
2022-09-29 05:50:26 +00:00 |
|
liuhong
|
46fb56826d
|
*adjust code.
|
2022-09-28 14:00:58 +00:00 |
|
liuhong
|
491227bfaa
|
*Adjust code for ditto format.
|
2022-09-28 13:53:45 +00:00 |
|
liuhong
|
419e054101
|
*Fix bug #27982 and Adjust code.
|
2022-09-28 07:38:07 +00:00 |
|
tianshujie
|
4778db197d
|
* Finish task #70017.
|
2022-09-28 13:39:06 +08:00 |
|
sunguangming
|
ac8f6c9413
|
* Code for task effort bug.
|
2022-09-26 14:50:04 +08:00 |
|
tianshujie
|
a20a8b6cdf
|
* Fix bug #27871.
|
2022-09-23 13:49:57 +08:00 |
|
曹延义
|
5667c2cade
|
* Fix bug #27854.
|
2022-09-23 11:22:36 +08:00 |
|
tianshujie
|
6f599fad75
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008
|
2022-09-23 10:26:29 +08:00 |
|
tianshujie
|
6a7c69e14e
|
* Finish task #70008.
|
2022-09-23 10:22:32 +08:00 |
|
tianshujie
|
a6cd4e549c
|
* Finish task #70094.
|
2022-09-22 18:13:50 +08:00 |
|
tianshujie
|
073c3fc987
|
* Finish task #70008.
|
2022-09-22 10:27:55 +08:00 |
|
tianshujie
|
a8bdc9bc6c
|
* Finish task #70008.
|
2022-09-22 09:07:11 +08:00 |
|
wangyidong
|
a497bafb9f
|
* fix bug.
|
2022-09-15 10:49:40 +08:00 |
|
wangyidong
|
0e46ac4a91
|
* fix bug #27468.
|
2022-09-13 16:36:32 +08:00 |
|
wangyidong
|
3dc0abf2d1
|
* adjust for check effort consumed.
|
2022-09-13 13:58:13 +08:00 |
|
wangyidong
|
09694f3751
|
* adjust for edit effort.
|
2022-09-13 13:37:13 +08:00 |
|
wangyidong
|
2ba29dd574
|
* adjust for effort when restart task.
|
2022-09-13 13:04:01 +08:00 |
|
wangyidong
|
f743da3ddc
|
* fix bug.
|
2022-09-13 11:04:04 +08:00 |
|
wangyidong
|
0881e39c54
|
* adjust for multi task.
|
2022-09-09 16:14:08 +08:00 |
|
lanzongjun
|
e0bb42fac5
|
resolve conflict
|
2022-09-08 11:18:09 +08:00 |
|
xieqiyu
|
5c3ff64ce7
|
* Code for task#67691.
|
2022-09-08 11:14:53 +08:00 |
|
xieqiyu
|
97b4bb9487
|
* Code for task#67691.
|
2022-09-08 11:03:44 +08:00 |
|
xieqiyu
|
80ff723165
|
* Code for task#67691.
|
2022-09-07 16:58:54 +08:00 |
|
wangyidong
|
aa9e733921
|
* fix bug #27286.
|
2022-09-07 09:20:26 +08:00 |
|