李玉春
|
f08514b544
|
Merge branch 'devops18_18277' into 'master'
* Fix bug#18277
See merge request easycorp/zentaopms!1316
|
2022-01-10 00:46:09 +00:00 |
|
liyuchun
|
ab097f3a61
|
* Fix bug #18264.
|
2022-01-10 08:39:41 +08:00 |
|
hufangzhou
|
b1db4e4bd1
|
# Fix bug #18281.
|
2022-01-07 11:20:02 +08:00 |
|
zenggang
|
a87d365a09
|
* Fix bug#18277
|
2022-01-07 03:03:44 +00:00 |
|
tianshujie
|
85773e58cd
|
* Fix bug #18280.
|
2022-01-07 11:01:47 +08:00 |
|
孙广明
|
8bbafaa21c
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug for write valiable name.
See merge request easycorp/zentaopms!1314
|
2022-01-07 02:43:35 +00:00 |
|
zhengrunyu
|
1f78499a4a
|
*Fix bug for write valiable name.
|
2022-01-07 10:28:30 +08:00 |
|
tianshujie
|
7aee562fea
|
* Fix bug #17790.
|
2022-01-07 10:26:27 +08:00 |
|
孙广明
|
ba53ac9f5b
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug for start and end time when edit it.
See merge request easycorp/zentaopms!1312
|
2022-01-07 02:15:47 +00:00 |
|
zhengrunyu
|
5475eeab94
|
*Fix bug for start and end time when edit it.
|
2022-01-07 10:11:36 +08:00 |
|
孙广明
|
236b790dca
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Code bug
See merge request easycorp/zentaopms!1311
|
2022-01-07 01:42:13 +00:00 |
|
zhengrunyu
|
412d143578
|
*Code bug
|
2022-01-07 09:39:54 +08:00 |
|
孙广明
|
cc6c2af0c1
|
Merge branch 'sprint/180_hufangzhou_bug' into 'master'
* Fix bug #16624.
See merge request easycorp/zentaopms!1310
|
2022-01-07 01:34:36 +00:00 |
|
孙广明
|
021b08995f
|
Merge branch 'sprint/180_xieqiyu_18241' into 'master'
* Fix bug#18241.
See merge request easycorp/zentaopms!1308
|
2022-01-07 01:33:48 +00:00 |
|
孙广明
|
c5bcbbb9ea
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Code edit and batchedit.
See merge request easycorp/zentaopms!1309
|
2022-01-07 01:29:44 +00:00 |
|
hufangzhou
|
003db31341
|
* Fix bug #16624.
|
2022-01-07 09:29:37 +08:00 |
|
xieqiyu
|
0d9b03dbfb
|
* Fix bug#18241.
|
2022-01-07 09:27:48 +08:00 |
|
zhengrunyu
|
325a57c292
|
*Code edit and batchedit.
|
2022-01-07 09:27:39 +08:00 |
|
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 |
|
孙广明
|
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 |
|
孙广明
|
27e9e40cb9
|
Merge branch 'master' into 'sprint/181_zhengrunyu_Fixbug'
# Conflicts:
# module/productplan/control.php
|
2022-01-06 06:19:17 +00:00 |
|