 mayue
|
12fa7ecaec
|
* Fix cfd issue.
|
2022-07-28 11:01:24 +08:00 |
|
|
王怡栋
|
6376fb58e0
|
Merge branch 'sprint/master_zhouxudong_25748' into 'master'
* Fix bug #25748.
See merge request easycorp/zentaopms!4698
|
2022-07-28 02:05:44 +00:00 |
|
|
王怡栋
|
9db987f0aa
|
Merge branch 'sprint/220_liumengyi_fixbug' into 'master'
* Finish task #62494, and fix bug #25797.
See merge request easycorp/zentaopms!4699
|
2022-07-28 02:05:11 +00: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 |
|
|
王怡栋
|
f970d5654b
|
Merge branch 'sprint/hufangzhou_25621' into 'master'
* Fix bug #25621.
See merge request easycorp/zentaopms!4697
|
2022-07-28 00:53:08 +00:00 |
|
|
王怡栋
|
d6ea8aea86
|
Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.
See merge request easycorp/zentaopms!4676
|
2022-07-28 00:52:40 +00:00 |
|
|
zhouxudong
|
2e6ef972b0
|
* Fix bug #25748.
|
2022-07-28 00:47:37 +00:00 |
|
|
hufangzhou
|
48285709d3
|
* Fix bug #25621.
|
2022-07-28 08:29:54 +08:00 |
|
|
xieqiyu
|
e927796641
|
* Fix bug#25004.
|
2022-07-28 08:16:07 +08:00 |
|
|
xieqiyu
|
0ec68feb10
|
* Fix bug#25004.
|
2022-07-27 21:38:28 +08:00 |
|
|
朱金勇
|
04cc07475b
|
Merge branch 'sprint/hufangzhou_closeApp' into 'master'
* Remove the unsed code.
See merge request easycorp/zentaopms!4696
|
2022-07-27 09:57:17 +00:00 |
|
|
朱金勇
|
0bb37ccf10
|
Merge branch 'fix_open_tab' into 'master'
* fix open tab with same url occurs blank page.
See merge request easycorp/zentaopms!4694
|
2022-07-27 09:57:07 +00:00 |
|
|
hufangzhou
|
a9f10fe868
|
* Remove the unsed code.
|
2022-07-27 17:40:31 +08:00 |
|
|
王怡栋
|
c605d6e51c
|
Merge branch 'sprint/master_zhouxudong_25103' into 'master'
* Fix bug #25103.
See merge request easycorp/zentaopms!4695
|
2022-07-27 09:35:06 +00:00 |
|
|
zhouxudong
|
45ace8beb5
|
* Fix bug #25103.
|
2022-07-27 09:11:56 +00: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 |
|
|
Hao Sun
|
b13e504ec4
|
* fix open tab with same url occurs blank page.
|
2022-07-27 08:58:40 +00:00 |
|
|
孙广明
|
ccf89f253d
|
Merge branch 'sprint/hufangzhou_25743' into 'master'
* Fix bug #25743.
See merge request easycorp/zentaopms!4692
|
2022-07-27 08:32:21 +00:00 |
|
|
liumengyi
|
845da88b1d
|
* Fix bug #25782.
|
2022-07-27 16:26:46 +08:00 |
|
|
hufangzhou
|
6e9ba532ba
|
* Fix bug #25743.
|
2022-07-27 16:20:21 +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 |
|
|
王怡栋
|
e5306848e2
|
Merge branch 'sprint/xuan_permission' into 'master'
* Adjust the xuan permission.
See merge request easycorp/zentaopms!4690
|
2022-07-27 08:01:09 +00:00 |
|
|
hufangzhou
|
9b719cf31e
|
* Adjust the xuan permission.
|
2022-07-27 15:54:51 +08:00 |
|
|
王怡栋
|
47d47c37c2
|
Merge branch 'sprint/hufangzhou_25758' into 'master'
* Fix bug #25758.
See merge request easycorp/zentaopms!4686
|
2022-07-27 07:45:38 +00:00 |
|
|
hufangzhou
|
96934390a2
|
* Move the from parameter to open source.
|
2022-07-27 15:44:44 +08:00 |
|
|
王怡栋
|
04ac3b3fa3
|
Merge branch 'cyy_sql' into 'master'
* Modify update sql.
See merge request easycorp/zentaopms!4688
|
2022-07-27 07:43:05 +00:00 |
|
|
caoyanyi
|
7b18471a21
|
* Modify update sql.
|
2022-07-27 15:38:17 +08:00 |
|
|
王怡栋
|
05b0986eed
|
Merge branch 'master_xieqiyu_25764' into 'master'
* Fix bug#25764.
See merge request easycorp/zentaopms!4685
|
2022-07-27 07:31:56 +00:00 |
|
|
朱金勇
|
7c9e7430e8
|
Merge branch 'sprint/xuanxuan_111' into 'master'
Sprint/xuanxuan 111
See merge request easycorp/zentaopms!4665
|
2022-07-27 07:30:08 +00:00 |
|
|
chaideqing
|
bd1ffecdd7
|
* code format
|
2022-07-27 15:29:48 +08:00 |
|
|
hufangzhou
|
a94f93dceb
|
* Fix bug #25758.
|
2022-07-27 15:27:47 +08:00 |
|
|
王怡栋
|
6c0a6f05e0
|
Merge branch 'cyy_optimize' into 'master'
Cyy optimize
See merge request easycorp/zentaopms!4683
|
2022-07-27 07:23:29 +00:00 |
|
|
caoyanyi
|
24d72be499
|
* Adjust code.
|
2022-07-27 15:22:45 +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 |
|
|
xieqiyu
|
22327a069c
|
* Fix bug#25764.
|
2022-07-27 15:22:20 +08:00 |
|
|
chaideqing
|
429f7638b7
|
* code format
|
2022-07-27 15:20:18 +08:00 |
|
|
王怡栋
|
0fb7686978
|
Merge branch 'sprint220_zg_61964' into 'master'
* Code for task#61964
See merge request easycorp/zentaopms!4680
|
2022-07-27 07:10:24 +00:00 |
|
|
zhouxudong
|
3a251f99b6
|
* Fix bug #24318.
|
2022-07-27 07:09:12 +00:00 |
|
|
王怡栋
|
87115957ea
|
Merge branch 'master_xieqiyu_25523' into 'master'
* Fix bug#25523.
See merge request easycorp/zentaopms!4679
|
2022-07-27 07:08:00 +00:00 |
|
|
王怡栋
|
836fd17490
|
Merge branch 'sprint/220_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!4682
|
2022-07-27 07:05:23 +00:00 |
|
|
孙广明
|
bf107fc06e
|
Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish story #35409, #35408, #35407.
See merge request easycorp/zentaopms!4681
|
2022-07-27 07:04:41 +00:00 |
|
|
hufangzhou
|
9bfb42cffd
|
* Add the new version.
|
2022-07-27 15:01:41 +08:00 |
|
|
caoyanyi
|
a0d16d3353
|
* Modify page style.
|
2022-07-27 14:50:09 +08:00 |
|
|
liumengyi
|
5551773576
|
* Finish story #35409, #35408, #35407.
|
2022-07-27 14:50:07 +08:00 |
|
|
zenggang
|
56b4e30328
|
* Code for task#61964
|
2022-07-27 06:45:26 +00:00 |
|