 李玉春
|
696c0ea711
|
Merge branch 'sunhuawei_fixbug_22375' into 'master'
*Fix bug #22375.
See merge request easycorp/zentaopms!3520
|
2022-05-19 07:32:07 +00:00 |
|
|
孙华伟
|
9e9395694d
|
*Fix bug #22375.
|
2022-05-19 15:27:37 +08:00 |
|
|
李玉春
|
fd977ff822
|
Merge branch 'sprint/191_zhouxin_fixbug' into 'master'
* Fix bug #22651,#22645.
See merge request easycorp/zentaopms!3512
|
2022-05-19 06:40:20 +00:00 |
|
|
王怡栋
|
3368eddc78
|
Merge branch 'sprint/192_hufangzhou_bugreport' into 'master'
# Finish task #54484,#54485,#54486.
See merge request easycorp/zentaopms!3514
|
2022-05-19 06:28:41 +00:00 |
|
|
hufangzhou
|
aa378a7f82
|
* Adjust the color.
|
2022-05-19 14:20:18 +08:00 |
|
|
hufangzhou
|
0a7b3d4786
|
* Adjust the color.
|
2022-05-19 13:54:14 +08:00 |
|
|
zhouxin
|
83248ea9f7
|
* Fix bug #22651,#22645.
|
2022-05-19 05:52:24 +00:00 |
|
|
孙广明
|
8135aee6cd
|
Merge branch 'sprint/191_zhouxin_54352'
|
2022-05-19 11:18:56 +08:00 |
|
|
李玉春
|
579391bd84
|
Merge branch 'sprint/191_liumengyi_54350' into 'master'
* Finish task #54350.
See merge request easycorp/zentaopms!3506
|
2022-05-19 03:18:38 +00:00 |
|
|
孙广明
|
6f150a9ea8
|
Merge branch 'master' into 'sprint/191_zhouxin_54352'
# Conflicts:
# module/datatable/config.php
|
2022-05-19 03:18:24 +00:00 |
|
|
liumengyi
|
d2f30493a3
|
* Code format for task#54350.
|
2022-05-19 11:17:15 +08:00 |
|
|
zhouxin
|
f08ea8b043
|
* Adjust code.
|
2022-05-19 03:15:13 +00:00 |
|
|
hufangzhou
|
775a397395
|
* Finish task #54484,#54485,#54486.
|
2022-05-19 11:09:53 +08:00 |
|
|
zhouxin
|
8a2e6d63cb
|
* Fix bug.
|
2022-05-19 03:07:55 +00:00 |
|
|
liumengyi
|
acd0b33267
|
* Fix bug for task #54350.
|
2022-05-19 11:05:22 +08:00 |
|
|
李玉春
|
aa81ba0c65
|
Merge branch 'sprint/191_liumengyi_54320' into 'master'
* Code format for task #54320.
See merge request easycorp/zentaopms!3505
|
2022-05-19 02:46:10 +00:00 |
|
|
李玉春
|
4b7fd6beee
|
Merge branch 'sprint/191_liumengyi_54318' into 'master'
* Finish task #54318.
See merge request easycorp/zentaopms!3502
|
2022-05-19 02:45:46 +00:00 |
|
|
李玉春
|
c8312488ff
|
Merge branch 'sprint/191_liumengyi_54319' into 'master'
* Finish task #54319.
See merge request easycorp/zentaopms!3501
|
2022-05-19 02:45:28 +00:00 |
|
|
liumengyi
|
7659a2376c
|
* Code format for task #54320.
|
2022-05-19 10:38:00 +08:00 |
|
|
liumengyi
|
cac837c0f9
|
* Code format for task #54319.
|
2022-05-19 10:36:46 +08:00 |
|
|
liumengyi
|
2d3f07a300
|
* Code format fot task #54318.
|
2022-05-19 10:35:12 +08:00 |
|
|
孙广明
|
2b523a1458
|
Merge branch 'sprint/mastr_zhouxudong_54473' into 'master'
Sprint/mastr zhouxudong 54473
See merge request easycorp/zentaopms!3504
|
2022-05-19 02:34:45 +00:00 |
|
|
李玉春
|
fd0ca7e9fd
|
Merge branch 'sprint/191_liumengyi_54320' into 'master'
* Finish task #54320.
See merge request easycorp/zentaopms!3503
|
2022-05-19 02:33:54 +00:00 |
|
|
zhouxudong
|
0485ec15a9
|
* Finish task #54474.
|
2022-05-19 02:32:48 +00:00 |
|
|
liumengyi
|
ff4e5ba635
|
* Fix bug for task#54350.
|
2022-05-19 10:24:14 +08:00 |
|
|
李玉春
|
6b667195b1
|
Merge branch 'sprint/191_tianshujie_54329' into 'master'
Sprint/191 tianshujie 54329
See merge request easycorp/zentaopms!3496
|
2022-05-19 02:22:36 +00:00 |
|
|
zhouxudong
|
8ebf5a47b6
|
Finish task #54474.
|
2022-05-19 02:19:28 +00:00 |
|
|
zhouxin
|
235b04f76e
|
* Finis task #54352.
|
2022-05-19 02:02:22 +00:00 |
|
|
孙广明
|
728cf77700
|
Merge branch 'sprint_sunjun_54322' into 'master'
Sprint sunjun 54322
See merge request easycorp/zentaopms!3480
|
2022-05-19 01:59:25 +00:00 |
|
|
tianshujie
|
244a281a47
|
* Finish task #54329.
|
2022-05-19 09:57:00 +08:00 |
|
|
liumengyi
|
f473c18251
|
* Finish task #54319.
|
2022-05-19 09:44:50 +08:00 |
|
|
tianshujie
|
db940f77fd
|
* Finish task #54329.
|
2022-05-19 09:43:34 +08:00 |
|
|
mayue
|
d11349b974
|
* Fix bug #22630.
|
2022-05-19 01:05:00 +00:00 |
|
|
王怡栋
|
41f77027bc
|
Merge branch 'sprint/master_zhouxudong_54491_1' into 'master'
* Finish task #54491
See merge request easycorp/zentaopms!3495
|
2022-05-19 00:55:52 +00:00 |
|
|
liumengyi
|
dee4ff7043
|
* Finish task #54318.
|
2022-05-19 08:55:27 +08:00 |
|
|
zhouxudong
|
496adec36a
|
* Finish task #54473.
|
2022-05-19 00:52:15 +00:00 |
|
|
tianshujie
|
d79a01aecb
|
* Finish task #54329.
|
2022-05-19 08:40:01 +08:00 |
|
|
zhouxudong
|
5b33b75d41
|
* Finish task #54476 #54475 #54474.
|
2022-05-18 10:18:02 +00:00 |
|
|
tianshujie
|
f0a7f24db9
|
* Finish task #54329.
|
2022-05-18 17:12:29 +08:00 |
|
|
tianshujie
|
ae9264e2db
|
* Fix bug #22644.
|
2022-05-18 17:11:28 +08:00 |
|
|
liumengyi
|
6aabf4eae0
|
* Finish task #54320.
|
2022-05-18 17:00:48 +08:00 |
|
|
李玉春
|
79006b3f89
|
Merge branch 'sprint/tianshujie_22636' into 'master'
* Fix bug #22636.
See merge request easycorp/zentaopms!3494
|
2022-05-18 08:57:05 +00:00 |
|
|
tianshujie
|
56bb8fbd35
|
* Fix bug #22636.
|
2022-05-18 16:53:12 +08:00 |
|
|
zhouxudong
|
9dab175600
|
* Finish task #54491_1
|
2022-05-18 08:52:46 +00:00 |
|
|
tianshujie
|
45e4fcdfab
|
* Fix bug #22636.
|
2022-05-18 16:51:09 +08:00 |
|
|
sunjun
|
2907b43b48
|
sprint_sunjun_54322
|
2022-05-18 08:49:16 +00:00 |
|
|
sunjun
|
4460d14984
|
sprint_sunjun_54322
|
2022-05-18 08:43:36 +00:00 |
|
|
sunjun
|
e617dc2b43
|
sprint_sunjun_54322
|
2022-05-18 08:23:28 +00:00 |
|
|
孙广明
|
9eb969342d
|
Merge branch 'sprint/191_zhouxin_54351' into 'master'
Sprint/191 zhouxin 54351
See merge request easycorp/zentaopms!3490
|
2022-05-18 08:09:34 +00:00 |
|
|
tianshujie
|
f1f4c511b5
|
* Finish task #54329.
|
2022-05-18 16:08:09 +08:00 |
|