 zhujinyong
|
b4c3ec0a9c
|
* Refactoring for extension.
|
2022-01-10 22:39:54 +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 |
|
|
李玉春
|
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 |
|
|
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 |
|
|
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 |
|
|
songchenxuan
|
1cf45ada5c
|
*Code for code review.
|
2022-01-06 13:34:53 +08:00 |
|
|
孙广明
|
0325b07527
|
Merge branch 'sprint/180_xieqiyu_46520' into 'master'
* Fix bug: test task count error.
See merge request easycorp/zentaopms!1288
|
2022-01-06 05:26:24 +00:00 |
|
|
孙广明
|
d1eab22822
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Fix bug for batch edit.
See merge request easycorp/zentaopms!1289
|
2022-01-06 05:22:05 +00:00 |
|
|
liumengyi
|
f8da5c8503
|
* Fix bug for batch edit.
|
2022-01-06 13:20:16 +08:00 |
|
|
zhouxin
|
7c1d29f971
|
Fix bug.
|
2022-01-06 05:12:36 +00:00 |
|
|
xieqiyu
|
ac110317ee
|
* Fix bug: test task count error.
|
2022-01-06 13:11:08 +08:00 |
|
|
songchenxuan
|
8927059720
|
*Code for code review.
|
2022-01-06 13:08:46 +08:00 |
|
|
zhouxin
|
b74b175a9a
|
Do some little change.
|
2022-01-06 05:01:18 +00:00 |
|
|
朱金勇
|
cb699a9f5a
|
Merge branch 'sprint/181_tianshujie_lang' into 'master'
* Modify the English language item of the currency.
See merge request easycorp/zentaopms!1277
|
2022-01-06 04:53:49 +00:00 |
|
|
李玉春
|
a19708adeb
|
Merge branch 'master' into 'sprint/32_zhouxin_fixbugs'
# Conflicts:
# module/project/config.php
|
2022-01-06 04:01:16 +00:00 |
|
|
zhouxin
|
0b08489176
|
Fix bug.
|
2022-01-06 03:57:50 +00:00 |
|
|
李玉春
|
ad0303f83d
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug
See merge request easycorp/zentaopms!1284
|
2022-01-06 03:34:05 +00:00 |
|
|
zhengrunyu
|
3c4b34dc9c
|
*Fix bug
|
2022-01-06 11:32:56 +08:00 |
|
|
李玉春
|
0943f58b83
|
Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug.
See merge request easycorp/zentaopms!1282
|
2022-01-06 03:27:12 +00:00 |
|