 孙广明
|
ecd7f1197f
|
* Fix product order bug.
|
2022-06-09 14:48:56 +08:00 |
|
|
王怡栋
|
174512c042
|
Merge branch 'sgm_feedback' into 'master'
* Finish task #56546.
See merge request easycorp/zentaopms!3824
|
2022-06-09 06:23:39 +00:00 |
|
|
孙广明
|
4fb2be7c61
|
* Finish task #56546.
|
2022-06-09 14:21:03 +08:00 |
|
|
wangyidong
|
f9a14f40d4
|
* adjust for task #56614.
|
2022-06-09 13:50:18 +08:00 |
|
|
孙广明
|
f3f8e20c9b
|
Merge branch 'sprint/201_zhouxin_my_work' into 'master'
* Finish task #56461,56462,56458,56465.
See merge request easycorp/zentaopms!3819
|
2022-06-09 05:23:01 +00:00 |
|
|
zhouxin
|
c056b7e567
|
* Finish task #56461,56462,56458,56465.
|
2022-06-09 05:18:27 +00:00 |
|
|
孙广明
|
1c2f7d9527
|
Merge branch 'sprint_200_fix_bug' into 'master'
* Fix bug#23481,bug#23466.
See merge request easycorp/zentaopms!3818
|
2022-06-09 05:11:02 +00:00 |
|
|
leiyong
|
a71825d731
|
* Fix bug.
|
2022-06-09 05:08:33 +00:00 |
|
|
leiyong
|
38a7d7334a
|
* Fix bug#23481,bug#23466.
|
2022-06-09 03:42:53 +00:00 |
|
|
wangyidong
|
5147feb289
|
* adjust for set flow uri.
|
2022-06-09 11:32:47 +08:00 |
|
|
wangyidong
|
77ce61fa0c
|
Merge branch 'sprint_200'
|
2022-06-09 11:17:20 +08:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
孙广明
|
ea2fe3e532
|
Merge branch 'sprint200_leiyong_task_56378' into 'sprint_200'
Sprint200 leiyong task 56378
See merge request easycorp/zentaopms!3801
|
2022-06-09 02:40:35 +00:00 |
|
|
leiyong
|
b471a3cdad
|
* Adjust code.
|
2022-06-09 02:36:56 +00:00 |
|
|
李玉春
|
3df63e8a2f
|
Merge branch 'sprint/199_mayue_story#9206' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!3814
|
2022-06-09 02:32:04 +00:00 |
|
|
王怡栋
|
be10e69fe1
|
Merge branch 'sprint/201_liumengyi_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3813
|
2022-06-09 01:58:21 +00:00 |
|
|
王怡栋
|
1407272999
|
Merge branch 'sprint/201_liumengyi_56454' into 'master'
* Fix bug #23439.
See merge request easycorp/zentaopms!3812
|
2022-06-09 01:58:01 +00:00 |
|
|
王怡栋
|
b0686ec22f
|
Merge branch 'sprint/201_liumengyi_23459' into 'master'
* Fix bug #23459.
See merge request easycorp/zentaopms!3810
|
2022-06-09 01:57:26 +00:00 |
|
|
王怡栋
|
4591b20bd7
|
Merge branch 'sprint/200-zhouxudong_56383' into 'sprint_200'
Sprint/200 zhouxudong 56383
See merge request easycorp/zentaopms!3809
|
2022-06-09 01:57:00 +00:00 |
|
|
王怡栋
|
de16cec573
|
Merge branch 'fixbug' into 'master'
* Fix bug #23433.
See merge request easycorp/zentaopms!3808
|
2022-06-09 01:55:28 +00:00 |
|
|
mayue
|
0beaa60d98
|
* Optimize code.
|
2022-06-09 09:55:19 +08:00 |
|
|
王怡栋
|
f1f255feb5
|
Merge branch 'sgm_fixbug' into 'master'
* Fix html tag bug.
See merge request easycorp/zentaopms!3804
|
2022-06-09 01:55:06 +00:00 |
|
|
liumengyi
|
b6073c2220
|
* Fix bug.
|
2022-06-09 09:53:27 +08:00 |
|
|
liumengyi
|
2279c5d602
|
* Fix bug #23439.
|
2022-06-09 09:45:06 +08:00 |
|
|
liumengyi
|
7cb27c5456
|
* Fix bug #23459.
|
2022-06-09 09:41:23 +08:00 |
|
|
tanghucheng
|
841c52b556
|
* Fix bug #23433.
|
2022-06-09 09:31:12 +08:00 |
|
|
孙广明
|
5ba7ac7d8b
|
Merge branch 'sprint/199_mayue_story#9206' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3807
|
2022-06-09 01:30:53 +00:00 |
|
|
孙广明
|
5120e3a718
|
Merge branch 'liyuchun_56551'
|
2022-06-09 09:30:26 +08:00 |
|
|
孙广明
|
9d477cc0cf
|
Merge branch 'master' into 'liyuchun_56551'
# Conflicts:
# db/update17.0.sql
|
2022-06-09 01:30:08 +00:00 |
|
|
孙广明
|
cfb3814e86
|
Merge branch 'sprint_201_56468' into 'master'
sprint_201_56468
See merge request easycorp/zentaopms!3806
|
2022-06-09 01:29:18 +00:00 |
|
|
mayue
|
4c0d6836b6
|
* Fix bug.
|
2022-06-09 09:28:00 +08:00 |
|
|
liyuchun
|
d4d24b6e9d
|
* Code for task #56551.
|
2022-06-09 01:24:38 +00:00 |
|
|
孙广明
|
3092800655
|
Merge branch 'sprint/199_zg_56544' into 'master'
* Finish task#56544
See merge request easycorp/zentaopms!3791
|
2022-06-09 01:19:51 +00:00 |
|
|
孙广明
|
a55b27a1c0
|
* Fix html tag bug.
|
2022-06-09 09:17:10 +08:00 |
|
|
孙广明
|
d9bee32c08
|
Merge branch 'sgm_review'
|
2022-06-09 09:14:46 +08:00 |
|
|
孙广明
|
3ecf2469bf
|
Merge branch 'master' into 'sgm_review'
# Conflicts:
# db/update17.0.sql
|
2022-06-09 01:14:10 +00:00 |
|
|
zhouxudong
|
f7c784d6fa
|
* Finish task #56383.
|
2022-06-09 01:10:38 +00:00 |
|
|
孙广明
|
91199908ce
|
* Code for task #56547.
|
2022-06-09 08:57:56 +08:00 |
|
|
zhouxudong
|
9694af1c79
|
* Finish task #56383.
|
2022-06-09 00:52:00 +00:00 |
|
|
sunjun
|
cd20d42306
|
sprint_201_56468
|
2022-06-09 00:39:32 +00:00 |
|
|
孙广明
|
07591cfd0f
|
Merge branch 'sprint_201_56459' into 'master'
Sprint 201 56459
See merge request easycorp/zentaopms!3802
|
2022-06-09 00:35:28 +00:00 |
|
|
sunjun
|
283df0a7b8
|
sprint_201_56459
|
2022-06-08 13:50:36 +00:00 |
|
|
leiyong
|
ce0dbc7d91
|
* Finish task#56373.
|
2022-06-08 10:53:01 +00:00 |
|
|
zhouxudong
|
6265fcd76f
|
* Finish task #56383.
|
2022-06-08 09:37:10 +00:00 |
|
|
zenggang
|
14ea5d8273
|
* Adjust code
|
2022-06-08 09:20:00 +00:00 |
|
|
zenggang
|
9549b91f83
|
* Adjust code
|
2022-06-08 09:13:48 +00:00 |
|
|
王怡栋
|
62f030b82d
|
Merge branch 'sprint/zdoo18_wangyuting' into 'master'
* Fix bug #23438.
See merge request easycorp/zentaopms!3800
|
2022-06-08 09:12:48 +00:00 |
|
|
liumengyi
|
56b622e91a
|
* Fix bug #23439.
|
2022-06-08 17:09:03 +08:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
王怡栋
|
dffd9a1f3b
|
Merge branch 'sprint/201_liumengyi_56455' into 'master'
* Finish task #56455.
See merge request easycorp/zentaopms!3799
|
2022-06-08 09:05:00 +00:00 |
|