 王怡栋
|
11e681d2f7
|
Merge branch 'sprint/master_zhouxudong_58605' into 'master'
* Finish task #58605.
See merge request easycorp/zentaopms!4198
|
2022-06-28 09:04:34 +00:00 |
|
|
王怡栋
|
c6a0541e58
|
Merge branch 'sgm_action' into 'master'
* Code for action details.
See merge request easycorp/zentaopms!4192
|
2022-06-28 08:45:27 +00:00 |
|
|
孙广明
|
8eec750c83
|
Merge branch 'sprint/210_mayue_bug#24479' into 'master'
* Fix bug #24479.
See merge request easycorp/zentaopms!4196
|
2022-06-28 08:40:07 +00:00 |
|
|
孙广明
|
02b10075ae
|
Merge branch 'sprint/210_mayue_bug#24482' into 'master'
* Fix bug #24482.
See merge request easycorp/zentaopms!4195
|
2022-06-28 08:35:45 +00:00 |
|
|
mayue
|
6fd3657052
|
* Fix bug #24479.
|
2022-06-28 16:34:27 +08:00 |
|
|
mayue
|
c1c145e4b7
|
* Fix bug #24482.
|
2022-06-28 16:27:10 +08:00 |
|
|
孙广明
|
f325c96060
|
Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24468, #24475.
See merge request easycorp/zentaopms!4194
|
2022-06-28 08:23:07 +00:00 |
|
|
liumengyi
|
c61cc238c0
|
* Fix bug #24475.
|
2022-06-28 16:16:51 +08:00 |
|
|
孙广明
|
6119092ed8
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #24423.
See merge request easycorp/zentaopms!4193
|
2022-06-28 07:51:38 +00:00 |
|
|
zhouxudong
|
0daa2e2130
|
* Finish task #58605.
|
2022-06-28 07:50:23 +00:00 |
|
|
孙广明
|
d104fe7e72
|
* Fix bug #24423.
|
2022-06-28 15:48:23 +08:00 |
|
|
liumengyi
|
6c8c18ef61
|
* Fix bug #24468.
|
2022-06-28 15:48:16 +08:00 |
|
|
王怡栋
|
0de19ab5d3
|
Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24464.
See merge request easycorp/zentaopms!4191
|
2022-06-28 07:32:36 +00:00 |
|
|
孙广明
|
ad17666521
|
* Code for action details.
|
2022-06-28 15:32:08 +08:00 |
|
|
wangyidong
|
4f5b6a6597
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-06-28 15:29:41 +08:00 |
|
|
wangyidong
|
549bd70626
|
* code for bug #24381.
|
2022-06-28 15:29:11 +08:00 |
|
|
liumengyi
|
38ff5fd283
|
* Fix bug #24464.
|
2022-06-28 15:20:31 +08:00 |
|
|
王怡栋
|
f56e26f665
|
Merge branch 'sgm_action' into 'master'
* Refactor action getDynamic.
See merge request easycorp/zentaopms!4190
|
2022-06-28 07:06:50 +00:00 |
|
|
王怡栋
|
b3a27bb266
|
Merge branch 'sprint/master_zhouxudong_57860' into 'master'
Sprint/master zhouxudong 57860
See merge request easycorp/zentaopms!4189
|
2022-06-28 07:05:57 +00:00 |
|
|
zhouxudong
|
3c9da06a99
|
* Finish task #57860.
|
2022-06-28 07:04:52 +00:00 |
|
|
孙广明
|
3cac1a020c
|
* Refactor action getDynamic.
|
2022-06-28 15:02:19 +08:00 |
|
|
王怡栋
|
afae79d45f
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #24406.
See merge request easycorp/zentaopms!4188
|
2022-06-28 06:31:17 +00:00 |
|
|
王怡栋
|
d642a4238b
|
Merge branch 'sprint/208_tianshujie_58552' into 'master'
Sprint/208 tianshujie 58552
See merge request easycorp/zentaopms!4187
|
2022-06-28 06:30:45 +00:00 |
|
|
孙广明
|
56a5488efc
|
* Fix bug #24406.
|
2022-06-28 14:25:02 +08:00 |
|
|
王怡栋
|
4d95909d6e
|
Merge branch 'sprint/208_liumengyi_58558' into 'master'
* Finish task #58558, #58559.
See merge request easycorp/zentaopms!4186
|
2022-06-28 06:22:42 +00:00 |
|
|
王怡栋
|
708f4ed932
|
Merge branch 'spritn209_leiyong_adjust_css' into 'master'
* Adjust CSS.
See merge request easycorp/zentaopms!4182
|
2022-06-28 06:03:47 +00:00 |
|
|
朱金勇
|
0766e36e20
|
Merge branch 'sprint/scx_api' into 'master'
* Update api.
See merge request easycorp/zentaopms!4185
|
2022-06-28 05:57:43 +00:00 |
|
|
leiyong
|
f8c67aabc1
|
* Adjust the indent.
|
2022-06-28 05:57:18 +00:00 |
|
|
liumengyi
|
aa0a763a17
|
* Finish task #58559.
|
2022-06-28 13:56:52 +08:00 |
|
|
宋辰轩
|
afdde557fc
|
* Update api.
|
2022-06-28 13:51:10 +08:00 |
|
|
leiyong
|
1d0bc1e818
|
* Finish task#58597.
|
2022-06-28 05:49:51 +00:00 |
|
|
王怡栋
|
f7ab50da63
|
Merge branch 'master_xieqiyu_58584' into 'master'
* Finish task#58584.
See merge request easycorp/zentaopms!4183
|
2022-06-28 05:48:34 +00:00 |
|
|
xieqiyu
|
320c88d44d
|
* Finish task#58584.
|
2022-06-28 13:30:51 +08:00 |
|
|
leiyong
|
a5b4a79ea8
|
* Adjust code.
|
2022-06-28 05:26:37 +00:00 |
|
|
liumengyi
|
2379f0e4a4
|
* Finish task #58558, #58559.
|
2022-06-28 13:22:23 +08:00 |
|
|
王怡栋
|
c0336de284
|
Merge branch 'sprint/209_hufangzhou_58569' into 'master'
* Finish task #58569.
See merge request easycorp/zentaopms!4181
|
2022-06-28 05:09:23 +00:00 |
|
|
wangyidong
|
9215c4f814
|
Merge branch 'sprint/208_liumengyi_58561'
|
2022-06-28 13:08:39 +08:00 |
|
|
王怡栋
|
956c806cf9
|
Merge branch 'master' into 'sprint/208_liumengyi_58561'
# Conflicts:
# db/update17.1.sql
|
2022-06-28 05:08:18 +00:00 |
|
|
liumengyi
|
cd3956ad1c
|
* Optimize code.
|
2022-06-28 13:06:38 +08:00 |
|
|
hufangzhou
|
91bc9e3327
|
* Finish task #58569.
|
2022-06-28 13:05:48 +08:00 |
|
|
孙广明
|
14e591f05e
|
Merge branch 'sprint209_leiyong_task_58579'
|
2022-06-28 13:05:35 +08:00 |
|
|
孙广明
|
14fa8cd30d
|
Merge branch 'master' into 'sprint209_leiyong_task_58579'
# Conflicts:
# module/my/css/task.css
|
2022-06-28 05:05:19 +00:00 |
|
|
liumengyi
|
ca6332efaa
|
* Optimize code.
|
2022-06-28 13:04:44 +08:00 |
|
|
孙广明
|
0c1c8ab16d
|
Merge branch 'sprint/210_mayue_bug#24408' into 'master'
* Fix bug #24408.
See merge request easycorp/zentaopms!4172
|
2022-06-28 05:04:23 +00:00 |
|
|
liumengyi
|
d08f95c0fa
|
* Optimize code.
|
2022-06-28 12:24:21 +08:00 |
|
|
tianshujie
|
f23564efbf
|
* Fix bug #24434.
|
2022-06-28 12:23:47 +08:00 |
|
|
tianshujie
|
f994051ea8
|
* Finish task #58552.
|
2022-06-28 12:16:11 +08:00 |
|
|
王怡栋
|
2875e33357
|
Merge branch 'sprint/208_liumengyi_58553' into 'master'
* Finish task #58561.
See merge request easycorp/zentaopms!4179
|
2022-06-28 03:52:02 +00:00 |
|
|
王怡栋
|
394216babf
|
Merge branch 'master_xieqiyu_58603' into 'master'
* Finish task#58603.
See merge request easycorp/zentaopms!4178
|
2022-06-28 03:30:36 +00:00 |
|
|
王怡栋
|
a1bb9ddb11
|
Merge branch 'master_xieqiyu_58587' into 'master'
Master xieqiyu 58587
See merge request easycorp/zentaopms!4176
|
2022-06-28 03:30:09 +00:00 |
|