 zhujinyong
|
89aaefc8c6
|
* Fix upgrade.
|
2022-03-08 13:15:47 +08:00 |
|
|
王怡栋
|
aff63f4ff7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 10:54:08 +08:00 |
|
|
王怡栋
|
b960a07ecf
|
* code for task #49352.
|
2022-03-08 10:52:48 +08:00 |
|
|
王怡栋
|
ed5aa3d335
|
Merge branch 'sprint/master_tanghucheng_bug' into 'master'
* Fix bug #50369.
See merge request easycorp/zentaopms!2133
|
2022-03-08 02:26:35 +00:00 |
|
|
tanghucheng
|
b279fbbc3e
|
* Fix bug #50369.
|
2022-03-08 10:19:07 +08:00 |
|
|
孙广明
|
f898e8c305
|
Merge branch 'sprint/187_liumengyi_moveCustomFiles' into 'master'
* Fix bug #50341.
See merge request easycorp/zentaopms!2131
|
2022-03-08 02:09:20 +00:00 |
|
|
朱金勇
|
8206e65301
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade error.
See merge request easycorp/zentaopms!2130
|
2022-03-08 02:09:00 +00:00 |
|
|
liumengyi
|
084d882f9b
|
* Fix bug #50341.
|
2022-03-08 10:07:42 +08:00 |
|
|
孙广明
|
6155c3ed21
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug
See merge request easycorp/zentaopms!2127
|
2022-03-08 01:58:50 +00:00 |
|
|
tianshujie
|
f42695af2c
|
* Modify the default width of the project name.
|
2022-03-08 09:57:14 +08:00 |
|
|
孙广明
|
6d14f4019a
|
Merge branch 'sprint/187_liumengyi_moveCustomFiles' into 'master'
* Remove custom modules.
See merge request easycorp/zentaopms!2129
|
2022-03-08 01:57:01 +00:00 |
|
|
liumengyi
|
a386589929
|
* Remove custom modules.
|
2022-03-08 09:54:44 +08:00 |
|
|
孙广明
|
f5f1679073
|
* Fix upgrade error.
|
2022-03-08 09:46:29 +08:00 |
|
|
tianshujie
|
19017161b6
|
* Delete useless variables.
|
2022-03-08 09:45:21 +08:00 |
|
|
zhujinyong
|
445bd93d3e
|
* Check version.
|
2022-03-08 09:41:38 +08:00 |
|
|
tianshujie
|
23f8d33293
|
* Add variable judgment.
|
2022-03-08 08:59:15 +08:00 |
|
|
zhujinyong
|
01c96e266c
|
* Format.
|
2022-03-08 08:58:27 +08:00 |
|
|
朱金勇
|
48d94bd7af
|
Merge branch 'sgm_db' into 'master'
* Add pro/biz/max sql to open.
See merge request easycorp/zentaopms!2126
|
2022-03-08 00:58:11 +00:00 |
|
|
孙广明
|
33fc87131e
|
* Add pro/biz/max sql to open.
|
2022-03-08 08:55:16 +08:00 |
|
|
tianshujie
|
c2f14bb9c2
|
* Finish task #50318.
|
2022-03-08 08:53:55 +08:00 |
|
|
孙广明
|
f76d93b889
|
Merge branch 'sprint/187_hufangzhou_20439' into 'master'
* Fix bug #20439.
See merge request easycorp/zentaopms!2125
|
2022-03-08 00:53:24 +00:00 |
|
|
朱金勇
|
610f42ca09
|
Merge branch 'autotest_ly' into 'master'
Add execution model
See merge request easycorp/zentaopms!2090
|
2022-03-08 00:25:42 +00:00 |
|
|
李玉春
|
bb059dfcaf
|
Merge branch 'devops23_20299' into 'master'
bug 20299
See merge request easycorp/zentaopms!2121
|
2022-03-08 00:25:19 +00:00 |
|
|
zhujinyong
|
4451a14e00
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 23:04:17 +08:00 |
|
|
zhujinyong
|
43ef4bc43c
|
* Fix upgrade.
|
2022-03-07 23:00:30 +08:00 |
|
|
hufangzhou
|
9482bb429a
|
* Fix bug #20439.
|
2022-03-07 17:53:29 +08:00 |
|
|
hufangzhou
|
24305ecd66
|
* Fix bug #20439.
|
2022-03-07 17:49:16 +08:00 |
|
|
王怡栋
|
4778730e92
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 17:27:25 +08:00 |
|
|
王怡栋
|
b936dae827
|
* code for task #50359.
|
2022-03-07 17:26:33 +08:00 |
|
|
王怡栋
|
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 |
|
|
zenggang
|
817f4dd5f0
|
* Fix bug#20299
|
2022-03-07 08:21:39 +00: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 |
|