 孙广明
|
748626a42e
|
Merge branch 'sprint/187_liumengyi_50321' into 'master'
* Finish task #50321,50341.
See merge request easycorp/zentaopms!2111
|
2022-03-07 06:20:18 +00:00 |
|
|
李玉春
|
7c4785dd42
|
Merge branch 'sprint/185_zhouxudong_49881' into 'master'
Sprint/185 zhouxudong 49881
See merge request easycorp/zentaopms!2113
|
2022-03-07 06:09:31 +00:00 |
|
|
liumengyi
|
119fde1713
|
* Finish task #50341.
|
2022-03-07 13:56:51 +08:00 |
|
|
周旭东
|
4666f2f5f6
|
Update browse.css
|
2022-03-07 05:52:11 +00:00 |
|
|
周旭东
|
2686139e04
|
Update browsebylist.html.php
|
2022-03-07 05:51:47 +00:00 |
|
|
zhouxudong
|
a7484fe721
|
* Fix task #49881.
|
2022-03-07 13:50:32 +08:00 |
|
|
liumengyi
|
dd7d8902b8
|
* Finish task #50321.
|
2022-03-07 13:38:02 +08:00 |
|
|
王怡栋
|
36b4af1756
|
Merge branch 'sprint/master_tanghucheng_fix'
|
2022-03-07 13:26:18 +08:00 |
|
|
王怡栋
|
a783b5d736
|
Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
# db/update16.4.sql
# module/user/view/batchcreate.html.php
|
2022-03-07 05:25:38 +00:00 |
|
|
tanghucheng
|
d61a43c7c1
|
* Fix bug.
|
2022-03-07 13:21:50 +08:00 |
|
|
孙广明
|
23ebec3d25
|
Merge branch 'sprint/187_liumengyi_50324' into 'master'
* Finish task #50324.
See merge request easycorp/zentaopms!2109
|
2022-03-07 05:19:08 +00:00 |
|
|
王怡栋
|
631a524f83
|
Merge branch 'sgm_50330' into 'master'
* Code for project other menu.
See merge request easycorp/zentaopms!2110
|
2022-03-07 05:18:32 +00:00 |
|
|
孙广明
|
1b137f7bc8
|
Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie
See merge request easycorp/zentaopms!2107
|
2022-03-07 05:13:55 +00:00 |
|
|
孙广明
|
3d2b198848
|
* Code for project other menu.
|
2022-03-07 13:13:13 +08:00 |
|
|
李玉春
|
cfa54bb7d6
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2108
|
2022-03-07 05:05:05 +00:00 |
|
|
tanghucheng
|
79a38cc9ad
|
* Fix bug.
|
2022-03-07 13:04:06 +08:00 |
|
|
xieqiyu
|
b455987346
|
* Fix bug.
|
2022-03-07 13:02:17 +08:00 |
|
|
tianshujie
|
8215369e8d
|
* Modify the code.
|
2022-03-07 12:26:44 +08:00 |
|
|
王怡栋
|
3b760eb27b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 11:32:37 +08:00 |
|
|
王怡栋
|
3a6dc5a72c
|
* code for task #48840.
|
2022-03-07 11:32:12 +08:00 |
|
|
tianshujie
|
01d0a6b902
|
* Finish task #50311.
|
2022-03-07 11:32:10 +08:00 |
|
|
孙广明
|
bb1f81b809
|
Merge branch 'zhouxin_fixbug' into 'master'
Fix bug.
See merge request easycorp/zentaopms!2105
|
2022-03-07 03:22:12 +00:00 |
|
|
zhouxin
|
97e443cf2c
|
Fix bug.
|
2022-03-07 03:20:19 +00:00 |
|
|
zhouxudong
|
a312035c1b
|
* Fix task #49881.
|
2022-03-07 11:17:40 +08:00 |
|
|
孙广明
|
91d3978a98
|
Merge branch 'pailei_mayue_task49305' into 'master'
* Finish task#49305.
See merge request easycorp/zentaopms!2104
|
2022-03-07 03:10:05 +00:00 |
|
|
mayue
|
c2295b2f8e
|
* Optimize code.
|
2022-03-07 11:08:23 +08:00 |
|
|
liumengyi
|
15a95e6c6b
|
* Finish task #50324.
|
2022-03-07 11:05:46 +08:00 |
|
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
|
孙广明
|
8c878ee546
|
Merge branch 'sprint/186_liumengyi_50325' into 'master'
* Finish task #50325.
See merge request easycorp/zentaopms!2098
|
2022-03-07 02:49:13 +00:00 |
|
|
孙广明
|
73e99235f6
|
Merge branch 'pailei_xieqiyu_20385' into 'pailei'
* Fix bug#20385.
See merge request easycorp/zentaopms!2102
|
2022-03-07 02:48:52 +00:00 |
|
|
xieqiyu
|
2b83d5d647
|
* Fix bug#20385.
|
2022-03-07 10:45:30 +08:00 |
|
|
李玉春
|
5c8f504da8
|
Merge branch 'sprint/pailei_zhouxudong_14549' into 'pailei'
* Finish task #49882.
See merge request easycorp/zentaopms!2100
|
2022-03-07 02:44:50 +00:00 |
|
|
王怡栋
|
74cf093beb
|
Merge branch 'sprint/187_hufangzhou_50310' into 'master'
* Fix bug #50310.
See merge request easycorp/zentaopms!2101
|
2022-03-07 02:41:06 +00:00 |
|
|
tianshujie
|
afed9c5c71
|
* Finish task #50338.
|
2022-03-07 10:37:41 +08:00 |
|
|
hufangzhou
|
6822e98080
|
* Fix bug #50310.
|
2022-03-07 10:36:44 +08:00 |
|
|
zhouxudong
|
c6eb97cc5f
|
* Finish task #49882.
|
2022-03-07 10:21:57 +08:00 |
|
|
王怡栋
|
3fc98877f9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 10:00:17 +08:00 |
|
|
王怡栋
|
da92204f31
|
* code for lite version.
|
2022-03-07 09:59:56 +08:00 |
|
|
李玉春
|
fe873b6a53
|
Merge branch 'sprint/185_zhouxudong_49881' into 'pailei'
* Finish task #49881.
See merge request easycorp/zentaopms!2097
|
2022-03-07 01:37:43 +00:00 |
|
|
liumengyi
|
0ca866ed99
|
* Fix bug #50325.
|
2022-03-07 09:37:42 +08:00 |
|
|
李玉春
|
60fd687731
|
Merge branch 'sprint/185_zhouxudong_49889' into 'pailei'
Sprint/185 zhouxudong 49889
See merge request easycorp/zentaopms!2094
|
2022-03-07 01:37:01 +00:00 |
|
|
李玉春
|
282de05e8f
|
Merge branch 'devops23_20308' into 'master'
修复bug 20308,20299
See merge request easycorp/zentaopms!2091
|
2022-03-07 01:33:14 +00:00 |
|
|
zhouxudong
|
bb3be7d065
|
* Finish task #49881.
|
2022-03-07 09:31:22 +08:00 |
|
|
孙广明
|
62111d3705
|
Merge branch 'pailei_zhouxin_49318' into 'pailei'
Finish task 49318.
See merge request easycorp/zentaopms!2095
|
2022-03-07 01:10:32 +00:00 |
|
|
王怡栋
|
77529777e0
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20022,18600
See merge request easycorp/zentaopms!2082
|
2022-03-07 01:09:18 +00:00 |
|
|
王怡栋
|
be02aede09
|
Merge branch 'sgm_50323' into 'master'
* Finish task #50323.
See merge request easycorp/zentaopms!2096
|
2022-03-07 01:01:09 +00:00 |
|
|
zhouxin
|
ea4c5ec99b
|
Adjust code.
|
2022-03-07 00:59:32 +00:00 |
|
|
孙广明
|
5cae6e943c
|
* Finish task #50323.
|
2022-03-07 08:54:42 +08:00 |
|
|
zenggang
|
c2e2385a9b
|
* Adjust code
|
2022-03-07 00:48:08 +00:00 |
|
|
tianshujie
|
9af3dcbb09
|
* Finish task #50303.
|
2022-03-07 08:47:26 +08:00 |
|