 孙广明
|
5175dc617f
|
* Code for story review btn.
|
2022-03-07 15:37:57 +08:00 |
|
|
孙广明
|
62f755c3b2
|
* Finish task #50341.
|
2022-03-07 15:28:52 +08:00 |
|
|
朱金勇
|
4283a02ec1
|
Merge branch 'sprint/186_hufangzhou_sql' into 'master'
* Adjust the sql.
See merge request easycorp/zentaopms!2119
|
2022-03-07 07:21:04 +00:00 |
|
|
朱金勇
|
76d45ded6d
|
Merge branch 'sprint/187_hufangzhou_50326' into 'master'
* Fix bug #50326.
See merge request easycorp/zentaopms!2115
|
2022-03-07 07:20:45 +00:00 |
|
|
hufangzhou
|
50d99f6e02
|
* Adjust the sql.
|
2022-03-07 15:12:11 +08:00 |
|
|
王怡栋
|
a412128236
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 15:01:43 +08:00 |
|
|
孙广明
|
2c5d4be0a1
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug
See merge request easycorp/zentaopms!2116
|
2022-03-07 07:01:32 +00:00 |
|
|
王怡栋
|
aa08dd8b07
|
* fix bug for batch create todo.
|
2022-03-07 15:01:11 +08:00 |
|
|
孙广明
|
9389955a28
|
Merge branch 'sprint/187_liumengyi_50324' into 'master'
* Finish task #50324.
See merge request easycorp/zentaopms!2117
|
2022-03-07 06:53:16 +00:00 |
|
|
孙广明
|
decf93c191
|
Merge branch 'sprint/187_liumengyi_50363' into 'master'
* Finish task #50363.
See merge request easycorp/zentaopms!2118
|
2022-03-07 06:53:03 +00:00 |
|
|
liumengyi
|
33403652d0
|
* Finish task #50363.
|
2022-03-07 14:48:38 +08:00 |
|
|
tianshujie
|
a1bd5d6d48
|
* Finish task #50329.
|
2022-03-07 14:29:01 +08:00 |
|
|
liumengyi
|
92c6de35f0
|
* Finish task #50324.
|
2022-03-07 14:27:50 +08:00 |
|
|
tianshujie
|
789817259e
|
* Finish task #50304.
|
2022-03-07 14:25:24 +08:00 |
|
|
孙广明
|
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 |
|
|
tianshujie
|
1e11c1b4e1
|
* Fix bug #20287.
|
2022-03-07 14:15:15 +08: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 |
|
|
hufangzhou
|
d077423919
|
* Fix bug #50326.
|
2022-03-07 14:06:23 +08:00 |
|
|
liumengyi
|
119fde1713
|
* Finish task #50341.
|
2022-03-07 13:56:51 +08:00 |
|
|
tianshujie
|
d616ef30c0
|
* Fix bug #20284.
|
2022-03-07 13:54:53 +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 |
|