王怡栋
|
ff22527151
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51306,#51304
See merge request easycorp/zentaopms!2395
|
2022-03-22 01:17:19 +00:00 |
|
Zongjun Lan
|
1e8b5800be
|
* fix task #51306,#51304
|
2022-03-22 09:16:16 +08:00 |
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
liyuchun
|
2c276b4322
|
Merge branch 'devops24'
|
2022-03-22 08:44:37 +08:00 |
|
liyuchun
|
8b2d19b30c
|
* Fix bug #20580.
|
2022-03-21 16:47:57 +08:00 |
|
Zongjun Lan
|
3d05fdb119
|
* fix task #51306,#51304
|
2022-03-21 14:50:58 +08:00 |
|
王怡栋
|
24442be3c5
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19287(biz)
See merge request easycorp/zentaopms!2357
|
2022-03-18 01:58:27 +00:00 |
|
tanghucheng
|
ec5f6244dd
|
* Fix bug #20906.
|
2022-03-18 09:18:34 +08:00 |
|
Zongjun Lan
|
ad622ccb02
|
* fix bug #t
|
2022-03-17 15:58:35 +08:00 |
|
zhouxin
|
b9d8edc02a
|
Fix bug #17224.
|
2022-03-17 02:51:52 +00:00 |
|
tanghucheng
|
18cd2a98aa
|
* Adjust for vision name.
|
2022-03-17 10:24:41 +08:00 |
|
zhouxin
|
bfa1f3940d
|
Fix bug #19818.
|
2022-03-14 08:40:16 +00:00 |
|
tianshujie
|
920f64f572
|
* Modify the api error report.
|
2022-03-14 15:57:02 +08:00 |
|
孙广明
|
87458bc808
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20702,20698,20642.
See merge request easycorp/zentaopms!2223
|
2022-03-14 02:13:14 +00:00 |
|
tanghucheng
|
a25fd822bd
|
* Fix bug #20702,20698,20642.
|
2022-03-14 09:55:44 +08:00 |
|
hufangzhou
|
8187472563
|
* Fix bug #20665.
|
2022-03-14 09:06:42 +08:00 |
|
xieqiyu
|
0cf8facbdf
|
* Fix bug#15946.
|
2022-03-11 11:16:11 +08:00 |
|
xieqiyu
|
e8a7995351
|
* Fix bug#16424,#20555.
|
2022-03-10 10:32:41 +08:00 |
|
liumengyi
|
dd7d8902b8
|
* Finish task #50321.
|
2022-03-07 13:38:02 +08:00 |
|
孙广明
|
3d2b198848
|
* Code for project other menu.
|
2022-03-07 13:13:13 +08:00 |
|
王怡栋
|
da92204f31
|
* code for lite version.
|
2022-03-07 09:59:56 +08:00 |
|
tianshujie
|
4f17795ffd
|
* Fix bug #20266.
|
2022-03-02 15:15:37 +08:00 |
|
tianshujie
|
0bb3371484
|
* Fix bug #20245.
|
2022-03-02 14:48:50 +08:00 |
|
hufangzhou
|
59181566ff
|
* Move the gantt extension file to common/view.
|
2022-03-02 13:22:53 +08:00 |
|
王怡栋
|
83ce0b8052
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #20238.
See merge request easycorp/zentaopms!2041
|
2022-03-02 03:19:32 +00:00 |
|
孙广明
|
b33cb32e4b
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv and classic mode.
See merge request easycorp/zentaopms!2031
|
2022-03-02 03:05:06 +00:00 |
|
孙广明
|
c3c1351400
|
* Fix bug #20238.
|
2022-03-02 10:53:30 +08:00 |
|
王怡栋
|
f71f500755
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 10:34:40 +08:00 |
|
王怡栋
|
76eea1f5d9
|
* adjust for global create.
|
2022-03-02 10:06:19 +08:00 |
|
tanghucheng
|
87aa943546
|
* Fix bug for classic.
|
2022-03-02 09:04:20 +08:00 |
|
tianshujie
|
cfb4b274a4
|
* Fix bug #20170.
|
2022-03-01 20:06:44 +08:00 |
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
孙广明
|
7ba3ed1dfc
|
Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.
See merge request easycorp/zentaopms!1980
|
2022-02-25 05:26:24 +00:00 |
|
zhengrunyu
|
b641170d85
|
* Fix bug 19941 19923 19922 19787.
|
2022-02-25 11:01:31 +08:00 |
|
tianshujie
|
ecf679aeaf
|
* Fix the problem of calling config error in static method.
|
2022-02-25 09:12:19 +08:00 |
|
孙广明
|
32f322ec51
|
Merge branch 'sprint/186_tianshujie_version' into 'sprint/185'
Sprint/186 tianshujie version
See merge request easycorp/zentaopms!1960
|
2022-02-24 09:04:10 +00:00 |
|
tianshujie
|
30d3fc1303
|
* Modify version judgment logic.
|
2022-02-24 16:21:58 +08:00 |
|
tianshujie
|
b7c3e92e95
|
* Modify version judgment logic.
|
2022-02-24 16:17:26 +08:00 |
|
zhujinyong
|
c7708b55cc
|
* Adjust style of vision switcher.
|
2022-02-24 16:02:17 +08:00 |
|
zhengrunyu
|
13882f5a5b
|
* Fix bug.
|
2022-02-24 13:59:37 +08:00 |
|
孙广明
|
b59b9cfba4
|
Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.
See merge request easycorp/zentaopms!1947
|
2022-02-24 05:28:15 +00:00 |
|
zhujinyong
|
ff8694661d
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-24 13:04:49 +08:00 |
|
zhujinyong
|
43998c45bb
|
* Fix vision switcher.
|
2022-02-24 13:04:25 +08:00 |
|
zhangzilong
|
7abab086a9
|
* Finish task #49280.
|
2022-02-24 11:31:37 +08:00 |
|
孙广明
|
e6338d280e
|
Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.
See merge request easycorp/zentaopms!1936
|
2022-02-24 02:46:43 +00:00 |
|
zhangzilong
|
861d6d3e47
|
* Finish task #49280.
|
2022-02-24 10:44:13 +08:00 |
|
zhangzilong
|
a68221ccaf
|
* Finish task #49280.
|
2022-02-24 10:41:54 +08:00 |
|
zhangzilong
|
a9e3772439
|
* Finish task #49280.
|
2022-02-24 09:30:52 +08:00 |
|
zhujinyong
|
891b914fc9
|
* Format code.
|
2022-02-23 16:39:15 +08:00 |
|
孙广明
|
0ee66db862
|
* Code for upgrade.
|
2022-02-23 13:44:09 +08:00 |
|