 王怡栋
|
10f0c44cd4
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug undefine lane
See merge request easycorp/zentaopms!2124
|
2022-03-07 09:20:17 +00:00 |
|
|
Zongjun Lan
|
3f9ca9c4fe
|
* fix bug undefine lane
|
2022-03-07 17:18:31 +08:00 |
|
|
王怡栋
|
eaba6dcc3c
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20329,20350,20366.
See merge request easycorp/zentaopms!2123
|
2022-03-07 09:09:58 +00:00 |
|
|
孙广明
|
26cdbe280c
|
Merge branch 'sprint/187_hufangzhou_tw' into 'master'
* Adjust the cn2tw file for xuan extension.
See merge request easycorp/zentaopms!2122
|
2022-03-07 08:48:16 +00:00 |
|
|
唐胡成
|
4c7b17eed2
|
Update create.html.php
|
2022-03-07 08:47:46 +00:00 |
|
|
tanghucheng
|
15e6262065
|
* Fix bug #20329,20350,20366.
|
2022-03-07 16:42:58 +08:00 |
|
|
hufangzhou
|
2339ff7b6f
|
* Adjust the cn2tw file for xuan extension.
|
2022-03-07 16:42:48 +08:00 |
|
|
孙广明
|
312f31db50
|
* Finish task #50327.
|
2022-03-07 16:22:25 +08:00 |
|
|
王怡栋
|
c3702f6928
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 15:53:18 +08:00 |
|
|
王怡栋
|
d801778065
|
* code for task #50361.
|
2022-03-07 15:53:04 +08:00 |
|
|
王怡栋
|
b2aa0be020
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 19010,19464,19496
See merge request easycorp/zentaopms!2112
|
2022-03-07 07:41:30 +00:00 |
|
|
王怡栋
|
759464a51d
|
Merge branch 'sgm_fixbug' into 'master'
* Fix story bug.
See merge request easycorp/zentaopms!2114
|
2022-03-07 07:40:56 +00:00 |
|
|
孙广明
|
5175dc617f
|
* Code for story review btn.
|
2022-03-07 15:37:57 +08:00 |
|
|
Zongjun Lan
|
7add528024
|
* fix bug 19496
|
2022-03-07 15:37:27 +08:00 |
|
|
李玉春
|
1b7347dd4c
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Modify the code.
See merge request easycorp/zentaopms!2120
|
2022-03-07 07:35:28 +00:00 |
|
|
tianshujie
|
38d53186ba
|
* Modify the code.
|
2022-03-07 15:34:10 +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 |
|
|
Zongjun Lan
|
812f676b3a
|
* fix bug 19464
|
2022-03-07 14:09:57 +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 |
|
|
Zongjun Lan
|
bbd580c373
|
* fix bug 19010
|
2022-03-07 13:44:17 +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 |
|