 wangyidong
|
aa0f666d41
|
* adjust for project flow.
|
2022-05-12 15:52:24 +08:00 |
|
|
孙广明
|
dd4566f1ea
|
Merge branch 'fixbug_sunjun_22349' into 'master'
*Fixbug_sunjun_22349
See merge request easycorp/zentaopms!3356
|
2022-05-12 07:36:26 +00:00 |
|
|
孙广明
|
cac35c816c
|
Merge branch 'fixbug_sunjun_22394' into 'master'
*Fixbug_sunjun_22394
See merge request easycorp/zentaopms!3363
|
2022-05-12 07:36:17 +00:00 |
|
|
孙广明
|
f4724390f6
|
Merge branch 'sunhuawei_fixbug' into 'master'
*解决功能演示过程中出现的问题。
See merge request easycorp/zentaopms!3365
|
2022-05-12 07:36:01 +00:00 |
|
|
孙华伟
|
a3ab4a596b
|
*解决功能演示过程中出现的问题。
|
2022-05-12 15:29:28 +08:00 |
|
|
sunjun
|
276ddada57
|
*Fixbug_sunjun_22394
|
2022-05-12 07:07:42 +00:00 |
|
|
sunjun
|
cb00a3b8ac
|
*Fixbug_sunjun_22349
|
2022-05-12 07:05:20 +00:00 |
|
|
sunjun
|
8732d9bcd3
|
*Fixbug_sunjun_22349
|
2022-05-12 07:01:30 +00:00 |
|
|
王怡栋
|
fa0b10275e
|
Merge branch 'sprint/daitingting_fix_isClickable' into 'master'
* Check execution privilege in buildOperateMenu function.
See merge request easycorp/zentaopms!3360
|
2022-05-12 06:06:05 +00:00 |
|
|
孙广明
|
52697b7a3c
|
Merge branch 'sprint/189_mayue_fixbug#22412' into 'master'
* Fix bug #22412.
See merge request easycorp/zentaopms!3361
|
2022-05-12 05:57:18 +00:00 |
|
|
mayue
|
f15f8f0345
|
* Fix bug #22412.
|
2022-05-12 05:55:25 +00:00 |
|
|
daitingting
|
da18989aa2
|
* Remove testin codes.
|
2022-05-12 05:55:14 +00:00 |
|
|
daitingting
|
e99212a7bc
|
* Check execution privilege in buildOperateMenu function.
|
2022-05-12 05:52:16 +00:00 |
|
|
wangyidong
|
c04ec4db8f
|
* fix for merge program when upgrade.
|
2022-05-12 13:46:57 +08:00 |
|
|
孙广明
|
03ee11e67f
|
Merge branch 'sprint/189_mayue_task#53652' into 'master'
* Fix bug #22411.
See merge request easycorp/zentaopms!3359
|
2022-05-12 05:45:50 +00:00 |
|
|
王怡栋
|
4bae11dbc6
|
Merge branch 'sprint/wangyuting_workflow' into 'master'
* Fix workflow bug.
See merge request easycorp/zentaopms!3357
|
2022-05-12 05:42:14 +00:00 |
|
|
mayue
|
53638cb9f2
|
* Fix bug.
|
2022-05-12 05:40:39 +00:00 |
|
|
王怡栋
|
9cd2982d2e
|
Merge branch 'sprint/189_hufangzhou_22364' into 'master'
* Fix bug #22364.
See merge request easycorp/zentaopms!3358
|
2022-05-12 05:38:14 +00:00 |
|
|
hufangzhou
|
d99acc8cf8
|
* Remove the unused code.
|
2022-05-12 13:37:11 +08:00 |
|
|
wangyuting2
|
34609e9036
|
* Optimize code.
|
2022-05-12 13:33:56 +08:00 |
|
|
李玉春
|
70fcf381cf
|
Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365
See merge request easycorp/zentaopms!3352
|
2022-05-12 05:33:28 +00:00 |
|
|
王怡栋
|
440891b197
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add sql
See merge request easycorp/zentaopms!3349
|
2022-05-12 05:29:51 +00:00 |
|
|
hufangzhou
|
80124c681e
|
* Fix bug #22364.
|
2022-05-12 13:29:39 +08:00 |
|
|
wangyuting2
|
28f4a384ee
|
* Add biz version judgment conditions.
|
2022-05-12 13:27:41 +08:00 |
|
|
孙华伟
|
3de0b23ab8
|
*Optimize the bug.
|
2022-05-12 13:26:19 +08:00 |
|
|
孙华伟
|
9c2926f59a
|
*Optimize the code.
|
2022-05-12 13:23:11 +08:00 |
|
|
孙华伟
|
6c2b318da4
|
*Optimize the code.
|
2022-05-12 13:21:44 +08:00 |
|
|
wangyidong
|
c0f53c6740
|
Merge branch 'sprint/189_zhouxudong_53651'
|
2022-05-12 13:20:50 +08:00 |
|
|
王怡栋
|
a9d13faa1a
|
Merge branch 'master' into 'sprint/189_zhouxudong_53651'
# Conflicts:
# module/execution/js/edit.js
|
2022-05-12 05:20:13 +00:00 |
|
|
lanzongjun
|
8d978d4295
|
* add sql
|
2022-05-12 13:18:22 +08:00 |
|
|
lanzongjun
|
39a4375b12
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-05-12 13:16:08 +08:00 |
|
|
zhouxudong
|
4bd2710b91
|
* Finish task #53651.
|
2022-05-12 05:15:13 +00:00 |
|
|
wangyuting2
|
6331cede38
|
* Fix workflow bug.
|
2022-05-12 13:07:37 +08:00 |
|
|
王怡栋
|
5674160b7e
|
Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666
See merge request easycorp/zentaopms!3353
|
2022-05-12 05:05:25 +00:00 |
|
|
zhouxudong
|
13e965e484
|
* Finish task #53651.
|
2022-05-12 05:02:51 +00:00 |
|
|
孙广明
|
ede17889fd
|
Merge branch 'sprint/189_mayue_task#53652'
|
2022-05-12 13:02:03 +08:00 |
|
|
孙广明
|
a770924dcf
|
Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
# module/project/model.php
|
2022-05-12 05:01:42 +00:00 |
|
|
sunjun
|
e44ddd11b4
|
*Fixbug_sunjun_22349
|
2022-05-12 03:58:26 +00:00 |
|
|
zhouxudong
|
f98d82234a
|
* Finish task #53651.
|
2022-05-12 03:57:23 +00:00 |
|
|
mayue
|
e65e7568b2
|
* Optimize code.
|
2022-05-12 03:37:22 +00:00 |
|
|
mayue
|
5a2ef22f3b
|
* Optimize code.
|
2022-05-12 03:17:00 +00:00 |
|
|
mayue
|
3a2c854159
|
* Optimize code.
|
2022-05-12 03:13:39 +00:00 |
|
|
孙华伟
|
4f51081da0
|
*Fix bug#22367.
|
2022-05-12 11:03:36 +08:00 |
|
|
mayue
|
ac6e3ab491
|
* Optimize code.
|
2022-05-12 02:58:23 +00:00 |
|
|
mayue
|
4460a50980
|
* Optimize code.
|
2022-05-12 02:50:13 +00:00 |
|
|
李玉春
|
b557af3aee
|
Merge branch 'sprint/189_liumengyi_unittest' into 'master'
* add unit test of sprint 189.
See merge request easycorp/zentaopms!3350
|
2022-05-12 02:47:51 +00:00 |
|
|
孙广明
|
1ea33ead7d
|
Merge branch 'sprint/189_zhouxin_22371' into 'master'
* Fix bug #22371.
See merge request easycorp/zentaopms!3351
|
2022-05-12 02:46:15 +00:00 |
|
|
zhouxin
|
3e2181dea0
|
* Fix bug #22371.
|
2022-05-12 02:44:37 +00:00 |
|
|
liumengyi
|
f3f439cb47
|
* Add annotation.
|
2022-05-12 10:44:16 +08:00 |
|
|
liumengyi
|
d254880466
|
* add unit test of sprint 189.
|
2022-05-12 10:40:41 +08:00 |
|