 tianshujie
|
c755ce356a
|
* Fix bug #18276.
|
2022-01-07 09:26:15 +08:00 |
|
|
孙广明
|
069f119566
|
Merge branch 'code_review/001_mayue' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!1302
|
2022-01-07 01:20:56 +00:00 |
|
|
mayue
|
7e3e42edaa
|
* Optimize code format.
|
2022-01-07 09:19:26 +08:00 |
|
|
mayue
|
91ff44d32e
|
* Optimize code.
|
2022-01-07 09:14:27 +08:00 |
|
|
孙广明
|
2bc556c3ce
|
Merge branch 'sprint/180_xieqiyu_modifyName' into 'master'
* Modify name.
See merge request easycorp/zentaopms!1306
|
2022-01-07 00:55:53 +00:00 |
|
|
xieqiyu
|
3186827004
|
* Modify name.
|
2022-01-07 08:53:18 +08:00 |
|
|
孙广明
|
94cf4fcb73
|
Merge branch 'sprint/180_songchenxuan_18074' into 'master'
Sprint/180 songchenxuan 18074
See merge request easycorp/zentaopms!1304
|
2022-01-07 00:50:23 +00:00 |
|
|
孙广明
|
e6cfd6b900
|
Merge branch 'sprint/180_xieqiyu_18166'
|
2022-01-07 08:48:31 +08:00 |
|
|
孙广明
|
d5efab2baf
|
Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
# module/project/config.php
|
2022-01-07 00:46:43 +00:00 |
|
|
xieqiyu
|
af54ab16c6
|
* Fix bug#18242,18241,18240,18239.
|
2022-01-07 08:35:18 +08:00 |
|
|
songchenxuan
|
16670c5483
|
*Fix bug #18074.
|
2022-01-06 17:36:55 +08:00 |
|
|
songchenxuan
|
3e5df731bc
|
*Fix bug #18074.
|
2022-01-06 17:32:48 +08:00 |
|
|
孙广明
|
15a142af8a
|
Merge branch 'sprint/180_songchenxuan_realname' into 'master'
Sprint/180 songchenxuan realname
See merge request easycorp/zentaopms!1300
|
2022-01-06 09:26:55 +00:00 |
|
|
孙广明
|
bff2f36c90
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Finish task #47090 #47098.
See merge request easycorp/zentaopms!1303
|
2022-01-06 09:25:15 +00:00 |
|
|
liumengyi
|
b6ea0afcb4
|
* Finish task #47090 #47098.
|
2022-01-06 16:56:27 +08:00 |
|
|
mayue
|
82fd1dac56
|
* Optimize code.
|
2022-01-06 16:43:53 +08:00 |
|
|
李玉春
|
05ec5dad47
|
Merge branch 'code_review/001_mayue' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!1301
|
2022-01-06 08:01:30 +00:00 |
|
|
mayue
|
1980e18d38
|
* Optimize code.
|
2022-01-06 16:00:28 +08:00 |
|
|
mayue
|
f151953a49
|
* Optimize code.
|
2022-01-06 15:55:49 +08:00 |
|
|
孙广明
|
bfc0897887
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug.
See merge request easycorp/zentaopms!1299
|
2022-01-06 07:54:02 +00:00 |
|
|
zhengrunyu
|
16aa3247a0
|
*Fix bug.
|
2022-01-06 15:45:45 +08:00 |
|
|
songchenxuan
|
a390fe4b6f
|
*Code review realname.
|
2022-01-06 15:33:15 +08:00 |
|
|
孙广明
|
f3e2bfde8a
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Finish task #47081 #47092 #47093 #47111.
See merge request easycorp/zentaopms!1298
|
2022-01-06 07:30:22 +00:00 |
|
|
liumengyi
|
6613dc493f
|
* Finish task #47092.
|
2022-01-06 15:29:45 +08:00 |
|
|
孙广明
|
6117c14d9f
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Unset required.
See merge request easycorp/zentaopms!1297
|
2022-01-06 07:25:35 +00:00 |
|
|
liumengyi
|
42e9076e66
|
* Finish task #47081 #47092 #47093 #47111.
|
2022-01-06 15:25:09 +08:00 |
|
|
zhengrunyu
|
8539bc7883
|
*Unset required.
|
2022-01-06 15:19:51 +08:00 |
|
|
songchenxuan
|
9cae04c917
|
*Code review realname.
|
2022-01-06 14:59:14 +08:00 |
|
|
孙广明
|
77c4ca007d
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug.
See merge request easycorp/zentaopms!1296
|
2022-01-06 06:39:00 +00:00 |
|
|
zhengrunyu
|
ea5a484019
|
*Fix bug.
|
2022-01-06 14:31:08 +08:00 |
|
|
孙广明
|
a33420c74b
|
Merge branch 'spirint/32_tianshujie_error' into 'master'
* Fix bug #18095.
See merge request easycorp/zentaopms!1295
|
2022-01-06 06:20:51 +00:00 |
|
|
孙广明
|
1ec9dcb113
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Fix bug for batch edit.
See merge request easycorp/zentaopms!1294
|
2022-01-06 06:20:21 +00:00 |
|
|
孙广明
|
1534b0a2b1
|
Merge branch 'sprint/181_zhengrunyu_Fixbug'
|
2022-01-06 14:19:44 +08:00 |
|
|
孙广明
|
27e9e40cb9
|
Merge branch 'master' into 'sprint/181_zhengrunyu_Fixbug'
# Conflicts:
# module/productplan/control.php
|
2022-01-06 06:19:17 +00:00 |
|
|
liumengyi
|
038b8b01c2
|
* Fix bug for batch edit.
|
2022-01-06 14:19:08 +08:00 |
|
|
tianshujie
|
411d284d43
|
* Fix bug #18095.
|
2022-01-06 14:19:05 +08:00 |
|
|
孙广明
|
e94c1128e1
|
Merge branch 'sprint/180_songchenxuan_fix_code_review' into 'master'
*Code for code review.
See merge request easycorp/zentaopms!1287
|
2022-01-06 06:18:23 +00:00 |
|
|
zhengrunyu
|
f2874479c2
|
*Adjust code.
|
2022-01-06 14:16:18 +08:00 |
|
|
liumengyi
|
b28777ecfd
|
* Fix bug for batch edit.
|
2022-01-06 14:04:18 +08:00 |
|
|
zhengrunyu
|
133316ba45
|
*Adjust code.
|
2022-01-06 14:03:25 +08:00 |
|
|
songchenxuan
|
2de429b441
|
*Code for code review.
|
2022-01-06 14:01:21 +08:00 |
|
|
songchenxuan
|
8a0448c99d
|
*Code for code review.
|
2022-01-06 13:56:06 +08:00 |
|
|
孙广明
|
db0e90f53e
|
Merge branch 'sprint/180_mayue_bug18147,18149' into 'master'
* Fix bug #18147,18149.
See merge request easycorp/zentaopms!1290
|
2022-01-06 05:55:04 +00:00 |
|
|
孙广明
|
8745c6ded0
|
Merge branch 'sprint/32_tianshujie_18095' into 'master'
* Fix bug #18095.
See merge request easycorp/zentaopms!1292
|
2022-01-06 05:53:48 +00:00 |
|
|
songchenxuan
|
e51d0283e9
|
*Code for code review.
|
2022-01-06 13:51:33 +08:00 |
|
|
mayue
|
a2765b7427
|
* Optimize code.
|
2022-01-06 13:50:43 +08:00 |
|
|
孙广明
|
b85d9d224d
|
Merge branch 'sprint/max_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!1291
|
2022-01-06 05:48:24 +00:00 |
|
|
tianshujie
|
127b69d4c7
|
* Fix bug #18095.
|
2022-01-06 13:47:18 +08:00 |
|
|
tanghucheng
|
b5de7cebfa
|
* Fix bug.
|
2022-01-06 13:46:58 +08:00 |
|
|
mayue
|
fcb699c84d
|
* Fix bug #18147,18149.
|
2022-01-06 13:38:10 +08:00 |
|