wangyidong
|
240111bc70
|
* code task #79283.
|
2022-12-09 16:23:57 +08:00 |
|
孙广明
|
88fb3d7cf6
|
Merge branch 'sprint/271_mayue_bug#30681' into 'master'
* Fix bug #30681.
See merge request easycorp/zentaopms!6510
|
2022-12-09 06:55:26 +00:00 |
|
mayue
|
c87bc41018
|
* Restore code.
|
2022-12-09 14:53:14 +08:00 |
|
孙广明
|
1f1e87e9cc
|
Merge branch 'master_xieqiyu_30698' into 'master'
* Fix bug#30698.
See merge request easycorp/zentaopms!6509
|
2022-12-09 06:49:32 +00:00 |
|
孙广明
|
8981507e80
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688
See merge request easycorp/zentaopms!6515
|
2022-12-09 06:48:13 +00:00 |
|
孙广明
|
0c7d26e9b8
|
Merge branch 'sprint/hufangzhou_feedback_1707' into 'master'
* Handle feedback #1707.
See merge request easycorp/zentaopms!6520
|
2022-12-09 06:47:38 +00:00 |
|
hufangzhou
|
6f9d1f9fdb
|
* Handle feedback #1707.
|
2022-12-09 06:37:38 +00:00 |
|
王怡栋
|
756389a53a
|
Merge branch 'sprint/feedback1675' into 'master'
Sprint/feedback1675
See merge request easycorp/zentaopms!6517
|
2022-12-09 06:04:17 +00:00 |
|
王怡栋
|
86cdff8385
|
Merge branch 'sprint/feedback1397' into 'master'
* Fix feedback 1397.
See merge request easycorp/zentaopms!6516
|
2022-12-09 06:04:03 +00:00 |
|
王怡栋
|
565337773e
|
Merge branch 'bug_30719' into 'master'
* Fix bug#30719
See merge request easycorp/zentaopms!6513
|
2022-12-09 06:03:42 +00:00 |
|
王怡栋
|
1793e734ce
|
Merge branch 'sprint/wangzemei/chosen' into 'master'
* Fix chosen class about execution
See merge request easycorp/zentaopms!6519
|
2022-12-09 06:03:21 +00:00 |
|
lanzongjun
|
980b2998ad
|
* Fix Bug #78688
|
2022-12-09 13:58:10 +08:00 |
|
wangzemei
|
74099e3538
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/chosen
|
2022-12-09 13:54:21 +08:00 |
|
wangzemei
|
0b6503dfcf
|
* Fix chosen class about execution
|
2022-12-09 13:48:26 +08:00 |
|
lanzongjun
|
d07a8a3e37
|
* Fix Bug #78695
|
2022-12-09 13:44:48 +08:00 |
|
Yagami
|
6205ee4a5e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-12-09 13:44:41 +08:00 |
|
Yagami
|
26fc535d82
|
* Finish task #78677.
|
2022-12-09 13:44:31 +08:00 |
|
wangyidong
|
68973d2a19
|
* fix bug #30753.
|
2022-12-09 13:20:40 +08:00 |
|
wangyidong
|
f1b27ca35a
|
* fix bug #30745.
|
2022-12-09 12:23:09 +08:00 |
|
lanzongjun
|
dd2160fde3
|
* Finish Bug #30662
|
2022-12-09 11:53:58 +08:00 |
|
chaideqing
|
0c16f68912
|
* Fix feedback #1675.
|
2022-12-09 11:01:50 +08:00 |
|
chaideqing
|
30b020f372
|
* Fix feedback 1397.
|
2022-12-09 09:41:18 +08:00 |
|
lanzongjun
|
8a0cbc6e6d
|
* Finish Bug #30637
|
2022-12-09 09:41:06 +08:00 |
|
zenggang
|
3d676b613a
|
* Fix bug#30719
|
2022-12-09 00:59:17 +00:00 |
|
wangyidong
|
3c3cacc47c
|
* adjust code.
|
2022-12-09 08:44:13 +08:00 |
|
wangyidong
|
adc9fb7c3d
|
* fix bug #30532.
|
2022-12-09 08:39:49 +08:00 |
|
mayue
|
c3c3a29502
|
* Fix bug #30681.
|
2022-12-08 17:17:30 +08:00 |
|
朱金勇
|
da4552fa16
|
Merge branch 'fix_feedback_1694' into 'master'
* Fix feedback #1694.
See merge request easycorp/zentaopms!6502
|
2022-12-08 09:08:56 +00:00 |
|
wangyidong
|
d9b0d2c2c4
|
* fix bug #30536.
|
2022-12-08 16:50:48 +08:00 |
|
王怡栋
|
7ca31ef126
|
Merge branch 'sprint/konglingmao_#feedback1279' into 'master'
* Resolved feedback #1279 ,testcase display error when import file have html char.
See merge request easycorp/zentaopms!6501
|
2022-12-08 08:30:16 +00:00 |
|
孙广明
|
3d2d237c4a
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30689#30700#30664
See merge request easycorp/zentaopms!6508
|
2022-12-08 08:28:58 +00:00 |
|
lanzongjun
|
c73d589b54
|
* Finish Bug #30664
|
2022-12-08 16:28:38 +08:00 |
|
lanzongjun
|
43b667ba2b
|
* Finish Bug #30700
|
2022-12-08 16:16:16 +08:00 |
|
xieqiyu
|
4724af01bb
|
* Fix bug#30698.
|
2022-12-08 16:11:20 +08:00 |
|
lanzongjun
|
e9bc72f2b2
|
* Finish Bug #30689
|
2022-12-08 15:56:30 +08:00 |
|
孙广明
|
8c415fad8c
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix build create
See merge request easycorp/zentaopms!6507
|
2022-12-08 07:49:48 +00:00 |
|
lanzongjun
|
f7b600ffcb
|
remove code
|
2022-12-08 15:49:06 +08:00 |
|
lanzongjun
|
1b4791f74b
|
* Fix build create
|
2022-12-08 15:45:36 +08:00 |
|
孙广明
|
38956c269c
|
Merge branch 'mayue_feedback#130_story#32666' into 'master'
* Finish feedback#130 and story#32666.
See merge request easycorp/zentaopms!6506
|
2022-12-08 07:28:22 +00:00 |
|
孙广明
|
53a538f203
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30687
See merge request easycorp/zentaopms!6505
|
2022-12-08 07:16:35 +00:00 |
|
lanzongjun
|
d8a5944a84
|
* Finish Bug
|
2022-12-08 15:15:49 +08:00 |
|
mayue
|
9b7c5be5ca
|
* Finish feedback#130 and story#32666.
|
2022-12-08 14:46:33 +08:00 |
|
lanzongjun
|
47284dc742
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-08 14:45:33 +08:00 |
|
wangyidong
|
dd7dfa2dc1
|
* fix bug #30660.
|
2022-12-08 14:37:24 +08:00 |
|
wangyidong
|
9a1d82200b
|
* fix bug #30667.
|
2022-12-08 14:32:51 +08:00 |
|
lanzongjun
|
e6989dc17c
|
* Finish Bug #30687
|
2022-12-08 14:32:27 +08:00 |
|
Yagami
|
fb95d28f5a
|
* Fix bug #30569.
|
2022-12-08 14:17:43 +08:00 |
|
Yagami
|
7deb827112
|
* Fix bug #30683.
|
2022-12-08 14:12:43 +08:00 |
|
孙广明
|
31ef3e0260
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480
See merge request easycorp/zentaopms!6498
|
2022-12-08 06:05:50 +00:00 |
|
孙广明
|
4566881b75
|
Merge branch 'master_xieqiyu_30588' into 'master'
* Fix bug#30588.
See merge request easycorp/zentaopms!6499
|
2022-12-08 06:05:33 +00:00 |
|