 zhouxudong
|
8f879f7516
|
* Fix bug #23554.
|
2022-06-10 04:57:04 +00:00 |
|
|
王怡栋
|
5917d86f0d
|
Merge branch 'sprint/201_liumengyi_23423' into 'master'
* Fix bug #23423.
See merge request easycorp/zentaopms!3854
|
2022-06-10 03:11:13 +00:00 |
|
|
liumengyi
|
c6eb7aaff0
|
* Fix bug #23423.
|
2022-06-10 11:08:43 +08:00 |
|
|
李玉春
|
15812a5cb1
|
Merge branch '201_zhouxin_56467' into 'master'
201 zhouxin 56467
See merge request easycorp/zentaopms!3853
|
2022-06-10 02:53:00 +00:00 |
|
|
zhouxin
|
555ca3c450
|
* Adjust code.
|
2022-06-10 02:50:27 +00:00 |
|
|
zhouxin
|
d1e3ba6c5e
|
* Adjust code.
|
2022-06-10 02:46:45 +00:00 |
|
|
zhouxin
|
b167243b48
|
* Finish task #56467.
|
2022-06-10 02:31:24 +00:00 |
|
|
孙广明
|
2363290d9a
|
Merge branch '199_mayue_task56550,56553' into 'master'
* Ajust mutual test issue.
See merge request easycorp/zentaopms!3852
|
2022-06-10 02:31:18 +00:00 |
|
|
mayue
|
e11b76d819
|
* Ajust mutual test issue.
|
2022-06-10 10:23:27 +08:00 |
|
|
孙广明
|
6d78419e2b
|
Merge branch 'sprint/201_liumengyi_23423' into 'master'
* Fix bug #23423.
See merge request easycorp/zentaopms!3851
|
2022-06-10 02:20:27 +00:00 |
|
|
liumengyi
|
0386e08d52
|
* Fix bug #23423.
|
2022-06-10 10:16:54 +08:00 |
|
|
王怡栋
|
2849f7a229
|
Merge branch 'sprint/mater_zhouxudong_56368' into 'master'
* Finish task #56368.
See merge request easycorp/zentaopms!3850
|
2022-06-10 02:07:33 +00:00 |
|
|
zhouxudong
|
de0d579bdd
|
* Finish task #56368.
|
2022-06-10 02:03:36 +00:00 |
|
|
王怡栋
|
097faf3c7d
|
Merge branch 'sprint/master_zhouxudong_56374' into 'master'
Sprint/master zhouxudong 56374
See merge request easycorp/zentaopms!3849
|
2022-06-10 02:01:58 +00:00 |
|
|
王怡栋
|
0f022766e3
|
Merge branch 'sgm_effortsql' into 'master'
* Finish task #56545.
See merge request easycorp/zentaopms!3848
|
2022-06-10 02:01:15 +00:00 |
|
|
王怡栋
|
74554fe0bb
|
Merge branch 'sprint200_leiyong_task_56370' into 'master'
Sprint200 leiyong task 56370
See merge request easycorp/zentaopms!3847
|
2022-06-10 01:51:28 +00:00 |
|
|
孙广明
|
212fb344c3
|
* Finish task #56545.
|
2022-06-10 09:44:48 +08:00 |
|
|
zhouxin
|
c7aa2f7fff
|
* Adjust code.
|
2022-06-10 01:43:10 +00:00 |
|
|
zhouxudong
|
82afc7ae76
|
* Finish task #56374.
|
2022-06-10 01:43:08 +00:00 |
|
|
zhouxin
|
b10daf5a01
|
* Adjust code.
|
2022-06-10 01:40:16 +00:00 |
|
|
leiyong
|
82caa7ee4d
|
* Fix bug#23542.
|
2022-06-10 01:36:47 +00:00 |
|
|
王怡栋
|
4eff0d7532
|
Merge branch 'sprint/201_tianshujie_fixbug' into 'master'
Sprint/201 tianshujie fixbug
See merge request easycorp/zentaopms!3846
|
2022-06-10 01:33:29 +00:00 |
|
|
zhouxudong
|
94c8b0a523
|
* Finish task #56374.
|
2022-06-10 01:32:52 +00:00 |
|
|
leiyong
|
3f03e8cb4a
|
* Finish task#56370.
|
2022-06-10 01:32:01 +00:00 |
|
|
tianshujie
|
01c135440b
|
* Fix bug #23455.
|
2022-06-10 09:31:44 +08:00 |
|
|
tianshujie
|
6825ac20c4
|
* Fix bug #23421.
|
2022-06-10 09:31:00 +08:00 |
|
|
tianshujie
|
baff0cf4fe
|
* Optimize code.
|
2022-06-10 09:23:12 +08:00 |
|
|
tianshujie
|
3f1dc22664
|
* Finish task #56469.
|
2022-06-10 09:22:50 +08:00 |
|
|
zhouxin
|
ee8af517fa
|
* Finish task #56467.
|
2022-06-10 01:22:12 +00:00 |
|
|
孙广明
|
4e40722b6d
|
Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!3845
|
2022-06-10 01:08:31 +00:00 |
|
|
王怡栋
|
fad3f54c7b
|
Merge branch 'sprint/201_tianshujie_56460' into 'master'
* Finish task #56460.
See merge request easycorp/zentaopms!3844
|
2022-06-10 01:07:17 +00:00 |
|
|
wangyidong
|
08f2b93399
|
Merge branch 'sprint/201_tianshujie_56469'
|
2022-06-10 09:06:30 +08:00 |
|
|
王怡栋
|
a9981b0a33
|
Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
# module/execution/control.php
# module/execution/js/kanban.js
# module/kanban/control.php
# module/kanban/model.php
|
2022-06-10 01:05:39 +00:00 |
|
|
mayue
|
a08bd00371
|
* Optimize code.
|
2022-06-10 09:05:33 +08:00 |
|
|
孙广明
|
45d130f354
|
Merge branch 'sprint199_zg' into 'master'
* Finish task#56549,56552
See merge request easycorp/zentaopms!3842
|
2022-06-10 01:03:54 +00:00 |
|
|
孙广明
|
0d4fe6983d
|
Merge branch 'sprint200_adjust_style' into 'master'
* Adjust style.
See merge request easycorp/zentaopms!3841
|
2022-06-10 01:02:20 +00:00 |
|
|
孙广明
|
4d07a2d45b
|
Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Finish task #56550,56553.
See merge request easycorp/zentaopms!3840
|
2022-06-10 01:02:07 +00:00 |
|
|
zenggang
|
8c5c2f2149
|
* Finish task#56549,56552
|
2022-06-10 00:51:11 +00:00 |
|
|
tianshujie
|
b8792fcb90
|
* Finish task #56469.
|
2022-06-10 08:35:22 +08:00 |
|
|
liumengyi
|
a5d2a87fdf
|
* Finish task #56469.
|
2022-06-09 17:33:46 +08:00 |
|
|
leiyong
|
70c1b06e1c
|
* Adjust code.
|
2022-06-09 09:31:45 +00:00 |
|
|
孙广明
|
448bec0032
|
Merge branch 'liyuchun_56556' into 'master'
Liyuchun 56556
See merge request easycorp/zentaopms!3826
|
2022-06-09 09:22:37 +00:00 |
|
|
孙广明
|
25a79b513b
|
Merge branch 'sprint/hufangzhou_productOrder' into 'master'
* Make the order of products in the product drop-down consistent with the product list.
See merge request easycorp/zentaopms!3836
|
2022-06-09 09:22:27 +00:00 |
|
|
孙广明
|
f02350122a
|
Merge branch 'liyuchun_56551' into 'master'
Liyuchun 56551
See merge request easycorp/zentaopms!3822
|
2022-06-09 09:21:32 +00:00 |
|
|
王怡栋
|
7d3ea4b91e
|
Merge branch 'sprint200_fix_bug_23486' into 'master'
* Fix bug#23494,bug#23486.
See merge request easycorp/zentaopms!3839
|
2022-06-09 09:17:19 +00:00 |
|
|
王怡栋
|
a49725905a
|
Merge branch 'fixbug' into 'master'
* Fix bug #23228.
See merge request easycorp/zentaopms!3837
|
2022-06-09 09:16:46 +00:00 |
|
|
mayue
|
edda32ba72
|
* Finish task #56550,56553.
|
2022-06-09 17:15:44 +08:00 |
|
|
李玉春
|
3cd9b94ecb
|
Merge branch 'cyy_56548' into 'master'
* Modify task import.
See merge request easycorp/zentaopms!3834
|
2022-06-09 09:13:47 +00:00 |
|
|
李玉春
|
fa152a30c8
|
Merge branch '201_zhouxin_fixbug' into 'master'
* Fix bug for task #56458.
See merge request easycorp/zentaopms!3838
|
2022-06-09 09:13:26 +00:00 |
|
|
zhouxin
|
367ed5c190
|
* Adjust code.
|
2022-06-09 08:59:56 +00:00 |
|