 wangyidong
|
7796bc8499
|
Merge branch 'sprint/devplat_30'
|
2022-08-05 08:46:26 +08:00 |
|
|
wangyuting2
|
f477e3cf1c
|
* Add execution bug approval menu.
|
2022-08-04 14:48:51 +08:00 |
|
|
zenggang
|
9314b23885
|
* Fix bug#25998,26017
|
2022-08-04 02:48:29 +00:00 |
|
|
王怡栋
|
fc494cc0f6
|
Merge branch 'sprint/221_tianshujie_fixbug' into 'master'
Sprint/221 tianshujie fixbug
See merge request easycorp/zentaopms!4781
|
2022-08-04 02:34:54 +00:00 |
|
|
tianshujie
|
e0aaa4c18c
|
* Fix bug #26008.
|
2022-08-04 09:28:18 +08:00 |
|
|
wangyidong
|
d4c95e6e9c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:14:41 +08:00 |
|
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|
|
zenggang
|
3a9f4d8ada
|
* Fix bug#25897,22882
|
2022-08-03 07:16:28 +00:00 |
|
|
李玉春
|
ed719f768f
|
Merge branch 'sprint/221_tianshujie_62947' into 'master'
Sprint/221 tianshujie 62947
See merge request easycorp/zentaopms!4761
|
2022-08-03 06:52:24 +00:00 |
|
|
tianshujie
|
b4a394718f
|
* Finish task #62947.
|
2022-08-03 14:49:42 +08:00 |
|
|
tianshujie
|
6661f80c81
|
* Fix bug #25984.
|
2022-08-03 14:19:00 +08:00 |
|
|
liumengyi
|
2c108bcf16
|
* Fix bug #25987.
|
2022-08-03 14:06:17 +08:00 |
|
|
tianshujie
|
167c36d6d5
|
* Finish task #62947.
|
2022-08-03 13:41:05 +08:00 |
|
|
wangyuting2
|
84c6278274
|
* Finish task #63288.
|
2022-08-03 13:32:41 +08:00 |
|
|
wangyuting2
|
fa81472771
|
* Adjust menu.
|
2022-08-03 13:32:41 +08:00 |
|
|
liumengyi
|
fc60a3f503
|
* Fix bug #25964.
|
2022-08-03 13:16:42 +08:00 |
|
|
王怡栋
|
1d59e34b07
|
Merge branch 'sprint/221_zg' into 'master'
Sprint/221 zg
See merge request easycorp/zentaopms!4751
|
2022-08-03 02:12:38 +00:00 |
|
|
王怡栋
|
9bb4369d7b
|
Merge branch 'sprint/221_liumengyi_62935' into 'master'
* Finish task #62935.
See merge request easycorp/zentaopms!4748
|
2022-08-03 01:21:03 +00:00 |
|
|
liumengyi
|
6d019f65e5
|
* Fix bug for task #62935.
|
2022-08-03 08:39:25 +08:00 |
|
|
zenggang
|
8f6ca19bf7
|
* Finish task#62937,62950
|
2022-08-02 08:19:56 +00:00 |
|
|
dongli
|
b664ed8b43
|
* Fix bug #25851
|
2022-08-02 07:03:57 +00:00 |
|
|
wangyuting2
|
dc14d91320
|
* Finish task #63286.
|
2022-08-02 14:54:20 +08:00 |
|
|
dongli
|
80753ec1f0
|
* Fix bug #25851.
|
2022-08-02 06:41:48 +00:00 |
|
|
liumengyi
|
dd2c92fb9d
|
* Finish task #62935.
|
2022-08-01 15:41:14 +08:00 |
|
|
王怡栋
|
9f7bbb08f8
|
Merge branch 'sprint/master_zhouxudong_25841' into 'master'
* Fix bug #25841.
See merge request easycorp/zentaopms!4718
|
2022-07-28 08:51:09 +00:00 |
|
|
王怡栋
|
4f565e25f4
|
Merge branch 'sprint220_zg_23205' into 'master'
* Fix bug#62106
See merge request easycorp/zentaopms!4717
|
2022-07-28 08:50:56 +00:00 |
|
|
zhouxudong
|
cae237887d
|
* Fix bug #25841.
|
2022-07-28 08:36:12 +00:00 |
|
|
zenggang
|
92abbcfdf5
|
* Fix bug#62106
|
2022-07-28 08:03:40 +00:00 |
|
|
王怡栋
|
6a7e5939e3
|
Merge branch 'leiyong_fix_bug' into 'master'
* Fix bug#25807.
See merge request easycorp/zentaopms!4716
|
2022-07-28 07:59:29 +00:00 |
|
|
leiyong
|
4d63e9fc36
|
* Fix bug#25807.
|
2022-07-28 07:56:15 +00:00 |
|
|
王怡栋
|
6446c442de
|
Merge branch 'sprint/220_liumengyi_25838' into 'master'
* Fix bug #25838.
See merge request easycorp/zentaopms!4714
|
2022-07-28 07:53:05 +00:00 |
|
|
liumengyi
|
51197d23c9
|
* Fix bug #25838.
|
2022-07-28 15:50:52 +08:00 |
|
|
zenggang
|
dfae2ec61f
|
* Fix bug#23205
|
2022-07-28 06:55:51 +00:00 |
|
|
liumengyi
|
a7568986c1
|
* Fix bug for change tab.
|
2022-07-28 14:21:28 +08:00 |
|
|
mayue
|
12fa7ecaec
|
* Fix cfd issue.
|
2022-07-28 11:01:24 +08:00 |
|
|
liumengyi
|
ad763d0fd5
|
* Optimize code for task #62494.
|
2022-07-28 10:04:05 +08:00 |
|
|
liumengyi
|
1375165c73
|
* Optimize code for task #62494.
|
2022-07-28 10:02:43 +08:00 |
|
|
liumengyi
|
e13315a151
|
* Finish task #62494.
|
2022-07-28 09:57:02 +08:00 |
|
|
liumengyi
|
60b32e04da
|
* Fix bug #25797.
|
2022-07-28 09:54:42 +08:00 |
|
|
王怡栋
|
e74ddb9e4a
|
Merge branch 'sprint/220_liumengyi_25782' into 'master'
* Fix bug #25782.
See merge request easycorp/zentaopms!4693
|
2022-07-27 08:59:41 +00:00 |
|
|
王怡栋
|
378fb33899
|
Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112
See merge request easycorp/zentaopms!4687
|
2022-07-27 08:59:23 +00:00 |
|
|
liumengyi
|
845da88b1d
|
* Fix bug #25782.
|
2022-07-27 16:26:46 +08:00 |
|
|
孙广明
|
41e968cf34
|
Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish task #62492, #62493, #62494.
See merge request easycorp/zentaopms!4691
|
2022-07-27 08:09:36 +00:00 |
|
|
liumengyi
|
352270909e
|
* Finish task #62492, #62493, #62494.
|
2022-07-27 16:07:23 +08:00 |
|
|
王怡栋
|
ad6f2d86fd
|
Merge branch 'sprint/master_zhouxudong_24318' into 'master'
* Fix bug #24318.
See merge request easycorp/zentaopms!4684
|
2022-07-27 07:22:38 +00:00 |
|
|
zhouxudong
|
3a251f99b6
|
* Fix bug #24318.
|
2022-07-27 07:09:12 +00:00 |
|
|
liumengyi
|
5551773576
|
* Finish story #35409, #35408, #35407.
|
2022-07-27 14:50:07 +08:00 |
|
|
liumengyi
|
757a39e21b
|
* Fix issue #696.
|
2022-07-27 13:06:34 +08:00 |
|
|
liumengyi
|
0ba22df874
|
* Fix issue #695.
|
2022-07-27 13:06:12 +08:00 |
|
|
zhouxudong
|
38ae663640
|
* Fix bug #25703.
|
2022-07-27 01:52:04 +00:00 |
|