 wangyidong
|
00b0aa0ba0
|
* adjust for create effort.
|
2022-09-08 09:47:56 +08:00 |
|
|
wangyidong
|
dfe8cd3088
|
Merge branch 'master_xieqiyu_67691'
|
2022-09-08 09:38:52 +08:00 |
|
|
王怡栋
|
84da5dced1
|
Merge branch 'master' into 'master_xieqiyu_67691'
# Conflicts:
# db/update17.6.sql
|
2022-09-08 01:38:22 +00:00 |
|
|
李玉春
|
bfe6177f3f
|
Merge branch 'sprint/237_liumengyi_67776' into 'master'
* Fix bug #25904.
See merge request easycorp/zentaopms!5286
|
2022-09-08 01:09:56 +00:00 |
|
|
xieqiyu
|
592a109bed
|
* Code for task#67691.
|
2022-09-08 09:09:03 +08:00 |
|
|
王怡栋
|
a416702128
|
Merge branch 'max_45' into 'master'
* Fix bug for my work auditplan.
See merge request easycorp/zentaopms!5287
|
2022-09-08 00:35:49 +00:00 |
|
|
孙广明
|
e9266176a4
|
Merge branch 'lyk_27318' into 'master'
* Fix bug #27318.
See merge request easycorp/zentaopms!5284
|
2022-09-08 00:34:46 +00:00 |
|
|
tanghucheng
|
b32e9247bf
|
* Fix bug for my work auditplan.
|
2022-09-08 08:34:27 +08:00 |
|
|
wangyidong
|
438c2b2524
|
* fix bug #27310.
|
2022-09-07 17:21:01 +08:00 |
|
|
wangyidong
|
a370daf00f
|
* fix bug #27307.
|
2022-09-07 17:16:30 +08:00 |
|
|
wangyidong
|
548c24ba42
|
* fix bug.
|
2022-09-07 17:11:12 +08:00 |
|
|
xieqiyu
|
80ff723165
|
* Code for task#67691.
|
2022-09-07 16:58:54 +08:00 |
|
|
liumengyi
|
79ac6a6ecf
|
* Fix bug #25904.
|
2022-09-07 16:56:12 +08:00 |
|
|
wangyidong
|
e0248af2a4
|
* adjust code.
|
2022-09-07 15:57:20 +08:00 |
|
|
wangyidong
|
6a6a049170
|
* fix bug.
|
2022-09-07 15:50:23 +08:00 |
|
|
wangyidong
|
4092d95876
|
* code for task #68204.
|
2022-09-07 15:01:27 +08:00 |
|
|
liuyongkai
|
e4d8ca86ad
|
* Fix bug #27318.
|
2022-09-07 06:42:51 +00:00 |
|
|
xieqiyu
|
334ecb7983
|
* Fix bug.
|
2022-09-07 14:41:48 +08:00 |
|
|
xieqiyu
|
62b51f7c9e
|
* Code for task#66954,66959.
|
2022-09-07 14:20:33 +08:00 |
|
|
wangyidong
|
d7dfd0fd3b
|
* fix bug.
|
2022-09-07 11:55:48 +08:00 |
|
|
wangyidong
|
a8a703bf16
|
* finish task #68203.
|
2022-09-07 11:08:48 +08:00 |
|
|
王怡栋
|
72dad72c13
|
Merge branch 'sprint/237_liumengyi_67768' into 'master'
* Fix bug #27186.
See merge request easycorp/zentaopms!5281
|
2022-09-07 02:35:29 +00:00 |
|
|
王怡栋
|
e6885c26ac
|
Merge branch 'sprint/237_liumengyi_67774' into 'master'
* Fix bug #26648.
See merge request easycorp/zentaopms!5278
|
2022-09-07 02:35:15 +00:00 |
|
|
王怡栋
|
ceeda8a41e
|
Merge branch 'master_xieqiyu_67693' into 'master'
* Add delay label.
See merge request easycorp/zentaopms!5277
|
2022-09-07 02:34:47 +00:00 |
|
|
王怡栋
|
9be46b416f
|
Merge branch 'max_45' into 'master'
* Finish task #67793.
See merge request easycorp/zentaopms!5282
|
2022-09-07 02:32:06 +00:00 |
|
|
wangyidong
|
b389d7ea97
|
Merge branch 'importExport'
|
2022-09-07 10:30:33 +08:00 |
|
|
王怡栋
|
17aec51cbe
|
Merge branch 'master' into 'importExport'
# Conflicts:
# module/port/model.php
|
2022-09-07 02:30:00 +00:00 |
|
|
tanghucheng
|
a2946b28af
|
* Finish task #67793.
|
2022-09-07 10:11:23 +08:00 |
|
|
wangyidong
|
2a7d73ef55
|
* fix for upgrade for effort order.
|
2022-09-07 10:06:23 +08:00 |
|
|
wangyidong
|
9648f86221
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-09-07 09:20:39 +08:00 |
|
|
liumengyi
|
72591c381e
|
* Fix bug #27186.
|
2022-09-07 09:20:35 +08:00 |
|
|
wangyidong
|
aa9e733921
|
* fix bug #27286.
|
2022-09-07 09:20:26 +08:00 |
|
|
李玉春
|
4c3e796891
|
Merge branch 'sprint/wangzemei/zuicss' into 'master'
* ZUI: remove ellipsis
See merge request easycorp/zentaopms!5280
|
2022-09-07 00:49:02 +00:00 |
|
|
wangzemei
|
1166c0747e
|
* ZUI: remove ellipsis
|
2022-09-07 00:40:56 +00:00 |
|
|
王怡栋
|
76447025a4
|
Merge branch 'sprint/237_tianshujie_bug' into 'master'
Sprint/237 tianshujie bug
See merge request easycorp/zentaopms!5279
|
2022-09-07 00:29:42 +00:00 |
|
|
liumengyi
|
66f95f43ab
|
* Optimize code for bug #26648.
|
2022-09-06 17:11:24 +08:00 |
|
|
liumengyi
|
e551fa25e8
|
* Fix bug #26648.
|
2022-09-06 17:06:26 +08:00 |
|
|
唐胡成
|
25613fe0c6
|
Update model.php
|
2022-09-06 09:05:22 +00:00 |
|
|
xieqiyu
|
bb38728a54
|
* Add delay label.
|
2022-09-06 16:01:45 +08:00 |
|
|
王怡栋
|
c7024eee3c
|
Merge branch 'master_xieqiyu_27006' into 'master'
* Fix bug#27006.
See merge request easycorp/zentaopms!5275
|
2022-09-06 07:56:04 +00:00 |
|
|
王怡栋
|
887e405c1c
|
Merge branch 'master_xieqiyu_27276' into 'master'
* Fix bug#27276,#27280.
See merge request easycorp/zentaopms!5271
|
2022-09-06 07:55:02 +00:00 |
|
|
王怡栋
|
f71df64f64
|
Merge branch 'sprint/workflow_fixbug#26826' into 'master'
* Finish task #67872. Fix bug #26826.
See merge request easycorp/zentaopms!5274
|
2022-09-06 07:54:41 +00:00 |
|
|
王怡栋
|
c13f57e39e
|
Merge branch 'sprint/daitingting_bug_67888' into 'master'
* Fix bug #67888.
See merge request easycorp/zentaopms!5272
|
2022-09-06 07:53:57 +00:00 |
|
|
王怡栋
|
20852c3bc7
|
Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #27020, #27004.
See merge request easycorp/zentaopms!5273
|
2022-09-06 07:53:08 +00:00 |
|
|
朱金勇
|
c8d127ac3f
|
Merge branch 'sprint/master_zhaoke_67308' into 'master'
Finish task 67308
See merge request easycorp/zentaopms!5211
|
2022-09-06 07:52:47 +00:00 |
|
|
王怡栋
|
e5bd16f5b6
|
Merge branch 'sprint/237_liumengyi_67702' into 'master'
* Fix bug #26193.
See merge request easycorp/zentaopms!5276
|
2022-09-06 07:52:27 +00:00 |
|
|
xieqiyu
|
4f9128b9c1
|
* Fix bug#27288.
|
2022-09-06 15:51:03 +08:00 |
|
|
xieqiyu
|
4275f13884
|
* Fix bug#27006.
|
2022-09-06 15:37:55 +08:00 |
|
|
liumengyi
|
b7fa4bd754
|
* Fix bug #26193.
|
2022-09-06 15:30:21 +08:00 |
|
|
wangyuting2
|
2fa3bb0892
|
* Finish task #67872. Fix bug #26826.
|
2022-09-06 15:26:21 +08:00 |
|