 liumengyi
|
ddb8a4037d
|
* Finish task #47340, #47341.
|
2022-01-11 10:11:59 +08:00 |
|
|
李玉春
|
b904bc3c58
|
Merge branch 'sgm_182db' into 'master'
* Add upgrade.sql.
See merge request easycorp/zentaopms!1325
|
2022-01-11 00:11:48 +00:00 |
|
|
zhujinyong
|
80765f894d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-01-10 21:13:52 +08:00 |
|
|
zhujinyong
|
f3e681c99f
|
* Add testTask table for update0.sql.
|
2022-01-10 21:12:04 +08:00 |
|
|
孙广明
|
714471e03b
|
Merge branch 'sprint/182_liumengyi_47483' into 'master'
* Finish task #47483.
See merge request easycorp/zentaopms!1327
|
2022-01-10 09:40:44 +00:00 |
|
|
liumengyi
|
cc3c90291d
|
* Finish task #47483.
|
2022-01-10 17:32:31 +08:00 |
|
|
孙广明
|
3e9bcdb892
|
Merge branch 'sprint/182_hufangzhou_47331' into 'master'
* Finish task #47331.
See merge request easycorp/zentaopms!1326
|
2022-01-10 09:21:23 +00:00 |
|
|
hufangzhou
|
0b9e2c0fa3
|
* Finish task #47331.
|
2022-01-10 17:18:18 +08:00 |
|
|
孙广明
|
ff6b122f3a
|
* Add upgrade.sql.
|
2022-01-10 16:46:02 +08:00 |
|
|
孙广明
|
db9681654b
|
Merge branch 'sprint/182_hufangzhou_47330' into 'master'
* Finish task #47330.
See merge request easycorp/zentaopms!1324
|
2022-01-10 08:36:39 +00:00 |
|
|
hufangzhou
|
075ac6efc5
|
* Adjust the lang item order.
|
2022-01-10 15:58:01 +08:00 |
|
|
hufangzhou
|
63226a2e84
|
* Finish task #47330.
|
2022-01-10 15:45:24 +08:00 |
|
|
孙广明
|
489c06ddb3
|
Merge branch 'sprint/182_tianshujie_18289' into 'master'
* Fix bug #18289.
See merge request easycorp/zentaopms!1323
|
2022-01-10 07:43:45 +00:00 |
|
|
tianshujie
|
0601474a78
|
* Fix bug #18289.
|
2022-01-10 15:41:24 +08:00 |
|
|
孙广明
|
3c2fe9e87f
|
Merge branch 'tianshujie_fixBug' into 'master'
* Fix bug #18287.
See merge request easycorp/zentaopms!1321
|
2022-01-10 05:35:22 +00:00 |
|
|
tianshujie
|
1ee5fb522f
|
* Fix bug #18287.
|
2022-01-10 12:15:19 +08:00 |
|
|
李玉春
|
f08514b544
|
Merge branch 'devops18_18277' into 'master'
* Fix bug#18277
See merge request easycorp/zentaopms!1316
zentaopms_16.1_20220110
|
2022-01-10 00:46:09 +00:00 |
|
|
孙广明
|
6ef3c5018e
|
Merge branch 'sprint/liyuchun_devops18' into 'master'
* Fix bug #18264.
See merge request easycorp/zentaopms!1319
|
2022-01-10 00:44:48 +00:00 |
|
|
liyuchun
|
ab097f3a61
|
* Fix bug #18264.
|
2022-01-10 08:39:41 +08:00 |
|
|
孙广明
|
07014ed347
|
Merge branch 'sprint/180_hufangzhou_18281' into 'master'
# Fix bug #18281.
See merge request easycorp/zentaopms!1317
|
2022-01-07 03:20:46 +00:00 |
|
|
hufangzhou
|
b1db4e4bd1
|
# Fix bug #18281.
|
2022-01-07 11:20:02 +08:00 |
|
|
孙广明
|
8626f5385f
|
Merge branch 'sprint/180_tianshujie_18280' into 'master'
* Fix bug #18280.
See merge request easycorp/zentaopms!1315
|
2022-01-07 03:04:41 +00: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 |
|
|
孙广明
|
7514d5d2fa
|
Merge branch 'sprint/181_tianshujie_17790' into 'master'
* Fix bug #17790.
See merge request easycorp/zentaopms!1313
|
2022-01-07 02:27:50 +00: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 |
|
|
孙广明
|
bddf81b2f7
|
Merge branch 'sprint/181_tianshujie_18276' into 'master'
* Fix bug #18276.
See merge request easycorp/zentaopms!1307
|
2022-01-07 01:28:21 +00: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 |
|
|
孙广明
|
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 |
|