 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 |
|
|
孙广明
|
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 |
|
|
xieqiyu
|
91493be372
|
* Fix bug#25523.
|
2022-07-27 14:11:10 +08:00 |
|
|
caoyanyi
|
87badf85e5
|
* Optimize pages.
|
2022-07-27 13:57:27 +08:00 |
|
|
孙广明
|
69ee2ea498
|
Merge branch 'sprint/220_tianshujie_issue' into 'master'
Sprint/220 tianshujie issue
See merge request easycorp/zentaopms!4678
|
2022-07-27 05:43:42 +00:00 |
|
|
孙广明
|
ec9ff2d44d
|
Merge branch 'sprint/220_liumengyi_fixissue' into 'master'
* Fix issue #695, #696.
See merge request easycorp/zentaopms!4675
|
2022-07-27 05:43:20 +00:00 |
|
|
孙广明
|
2e3f503d95
|
Merge branch 'sprint/hufangzhou_compatibleMax' into 'master'
* Compatible with zentaomax.
See merge request easycorp/zentaopms!4677
|
2022-07-27 05:43:07 +00:00 |
|
|
tianshujie
|
ca01a7540b
|
* Fix bug #25732.
|
2022-07-27 13:40:43 +08:00 |
|
|
hufangzhou
|
c4296b1b9f
|
* Compatible with zentaomax.
|
2022-07-27 13:35:06 +08:00 |
|
|
tianshujie
|
270618a38c
|
* Fix bug #25733.
|
2022-07-27 13:29:19 +08:00 |
|
|
tianshujie
|
21be27748f
|
* Fix bug #25745.
|
2022-07-27 13:12:37 +08:00 |
|
|
孙广明
|
61babc61a5
|
Merge branch 'sprint/scx_userapi' into 'master'
* Add User api param.
See merge request easycorp/zentaopms!4645
|
2022-07-27 05:10:22 +00: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 |
|
|
李玉春
|
1dd7771fdc
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_ZTF' into 'master'
* Add Icon ZTF
See merge request easycorp/zentaopms!4674
|
2022-07-27 03:46:14 +00:00 |
|
|
guofeilong
|
4f82de69c8
|
* Add Icon ZTF
|
2022-07-27 03:39:49 +00:00 |
|
|
tianshujie
|
6454cc7025
|
* Resolve issue #697.
|
2022-07-27 11:15:27 +08:00 |
|
|
李玉春
|
8e0a5d4eee
|
Merge branch 'cyy_git_tag' into 'master'
* Modify tag get.
See merge request easycorp/zentaopms!4670
|
2022-07-27 02:10:11 +00:00 |
|
|
王怡栋
|
0b87a710f1
|
Merge branch 'sprint/master_zhouxudong_25703' into 'master'
* Fix bug #25703.
See merge request easycorp/zentaopms!4673
|
2022-07-27 02:06:23 +00:00 |
|
|
王怡栋
|
8eb24df570
|
Merge branch 'sprint220_zg_61964' into 'master'
Sprint220 zg 61964
See merge request easycorp/zentaopms!4663
|
2022-07-27 02:05:06 +00:00 |
|