 李玉春
|
bb05dc2ffe
|
Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'
Pailei2 sunhuawei 50714
See merge request easycorp/zentaopms!2231
|
2022-03-14 08:17:05 +00:00 |
|
|
李玉春
|
f289ca23d6
|
Merge branch 'pailei2_sunhuawei_50428' into 'pailei2'
Pailei2 sunhuawei 50428
See merge request easycorp/zentaopms!2228
|
2022-03-14 08:15:16 +00:00 |
|
|
孙广明
|
ff3d2c46e2
|
Merge branch 'sprint/pailei2_tianshujie_50402' into 'pailei2'
Sprint/pailei2 tianshujie 50402
See merge request easycorp/zentaopms!2239
|
2022-03-14 08:12:46 +00:00 |
|
|
孙华伟
|
ffa6d43736
|
*Fix bug#20452
|
2022-03-14 16:10:35 +08:00 |
|
|
tianshujie
|
920f64f572
|
* Modify the api error report.
|
2022-03-14 15:57:02 +08:00 |
|
|
孙广明
|
acadf9cdce
|
Merge branch 'pailei2_zhouxin_50416' into 'pailei2'
Pailei2 zhouxin 50416
See merge request easycorp/zentaopms!2225
|
2022-03-14 06:22:18 +00:00 |
|
|
孙广明
|
d514977996
|
Merge branch 'pailei2_zhouxin_50409' into 'pailei2'
Fix bug #50409.
See merge request easycorp/zentaopms!2229
|
2022-03-14 06:21:00 +00:00 |
|
|
孙广明
|
afb4010223
|
Merge branch 'pailei_sj_50431' into 'pailei2'
fix bug #50431
See merge request easycorp/zentaopms!2214
|
2022-03-14 06:20:37 +00:00 |
|
|
孙广明
|
93842face3
|
Merge branch 'pailei_sunjun_50432' into 'pailei2'
地盘里看板项目icon显示看板
See merge request easycorp/zentaopms!2202
|
2022-03-14 06:19:06 +00:00 |
|
|
zhouxin
|
767d6efa03
|
Fix bug #50409.
|
2022-03-14 05:27:23 +00:00 |
|
|
孙华伟
|
6d3030063f
|
*
|
2022-03-14 13:11:08 +08:00 |
|
|
sunjun
|
395314f726
|
fixbug #50432
|
2022-03-14 11:31:09 +08:00 |
|
|
sunjun
|
f105fc944f
|
fixbug #50421
|
2022-03-14 11:20:34 +08:00 |
|
|
sunjun
|
9621a762f1
|
fixbug #50431
|
2022-03-14 11:05:55 +08:00 |
|
|
sunjun
|
8269e9229a
|
fixbug #50431
|
2022-03-14 10:38:45 +08:00 |
|
|
孙华伟
|
02e25eadb0
|
*
|
2022-03-14 10:35:21 +08:00 |
|
|
孙华伟
|
5ee928527a
|
*Fix bug#20455
|
2022-03-14 10:30:55 +08:00 |
|
|
孙华伟
|
a8fc47a9b9
|
*
|
2022-03-14 10:27:03 +08:00 |
|
|
zhouxin
|
f9c4e15149
|
Fix bug #50416.
|
2022-03-14 02:09:18 +00:00 |
|
|
tianshujie
|
ccb9dfdf07
|
* Fix bug #17960.
|
2022-03-14 10:04:23 +08:00 |
|
|
孙华伟
|
0402417504
|
*Fix bug#20455
|
2022-03-14 09:13:28 +08:00 |
|
|
sunjun
|
7411c4c4f3
|
fix bug #50431
|
2022-03-11 15:59:07 +08:00 |
|
|
sunjun
|
d4b8dfef02
|
fix bug #50432
|
2022-03-11 15:09:59 +08:00 |
|
|
sunjun
|
0b0a1011e9
|
fix bug #50432
|
2022-03-11 15:02:14 +08:00 |
|
|
zhouxin
|
f470e0d96b
|
Fix bug #50416.
|
2022-03-11 06:58:47 +00:00 |
|
|
zhouxin
|
9f289a632a
|
Fix bug 50416.
|
2022-03-11 06:45:03 +00:00 |
|
|
孙广明
|
9242fefd21
|
Merge branch 'sprint/pailei2_zhouxudong_50400' into pailei2
|
2022-03-11 14:31:28 +08:00 |
|
|
孙广明
|
18efbd44b7
|
Merge branch 'pailei2' into 'sprint/pailei2_zhouxudong_50400'
# Conflicts:
# module/product/model.php
|
2022-03-11 06:31:07 +00:00 |
|
|
zhouxudong
|
3b6f94502b
|
* Fix bu* Fix bugg
|
2022-03-11 14:27:15 +08:00 |
|
|
孙广明
|
3011da9418
|
Merge branch 'pailei2_xieqiyu_50426' into 'pailei2'
* Fix bug#15946.
See merge request easycorp/zentaopms!2199
|
2022-03-11 06:26:12 +00:00 |
|
|
sunjun
|
bbd2ccff01
|
bug优化
|
2022-03-11 14:25:56 +08:00 |
|
|
孙广明
|
d3760d2d72
|
Merge branch 'sprint/pailei2_zhouxudong_50400' into 'pailei2'
* Finish task #50400.
See merge request easycorp/zentaopms!2200
|
2022-03-11 05:37:17 +00:00 |
|
|
周旭东
|
e6d630f79b
|
Update model.php
|
2022-03-11 05:35:31 +00:00 |
|
|
sunjun
|
00aaefa61c
|
地盘里看板项目icon显示看板
|
2022-03-11 13:35:03 +08:00 |
|
|
xieqiyu
|
0cf8facbdf
|
* Fix bug#15946.
|
2022-03-11 11:16:11 +08:00 |
|
|
zhouxudong
|
430b666870
|
* Finish task #50400.
|
2022-03-11 11:14:18 +08:00 |
|
|
李玉春
|
abad40f8f6
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407
See merge request easycorp/zentaopms!2196
|
2022-03-11 02:42:52 +00:00 |
|
|
孙华伟
|
38ddffdd3f
|
*
|
2022-03-11 10:39:39 +08:00 |
|
|
孙华伟
|
e4f3113301
|
*Fix bug#17639
|
2022-03-11 10:36:44 +08:00 |
|
|
孙广明
|
d69c8dd9dd
|
Merge branch 'pailei_sj_50431' into 'pailei2'
bug增加必填标识
See merge request easycorp/zentaopms!2193
|
2022-03-11 01:03:22 +00:00 |
|
|
sunjun
|
f69c9746b5
|
bug增加必填标识
|
2022-03-11 08:52:04 +08:00 |
|
|
孙华伟
|
1dd0399e02
|
*Fix bug #17639.
|
2022-03-11 08:33:09 +08:00 |
|
|
李玉春
|
8b58824005
|
Merge branch 'pailei2_mayue_bug20539' into 'pailei2'
* Fix bug #20539.
See merge request easycorp/zentaopms!2186
|
2022-03-10 06:40:52 +00:00 |
|
|
mayue
|
4092e998c0
|
* Fix bug #20539.
|
2022-03-10 14:36:46 +08:00 |
|
|
孙广明
|
5339844ad2
|
Merge branch 'pailei2_zhouxin_50414' into 'pailei2'
Pailei2 zhouxin 50414
See merge request easycorp/zentaopms!2182
|
2022-03-10 05:23:45 +00:00 |
|
|
zhouxin
|
38ebc88fd5
|
Fix bug.
|
2022-03-10 03:20:19 +00:00 |
|
|
zhouxin
|
ccdcec9e32
|
Fix bug 50414.
|
2022-03-10 01:49:52 +00:00 |
|
|
李玉春
|
7d03df0bb0
|
Merge branch 'sprint/pailei_zhouxudong_50424' into 'pailei2'
* Finish task #50424.
See merge request easycorp/zentaopms!2172
|
2022-03-10 00:38:19 +00:00 |
|
|
李玉春
|
8ac10e48fc
|
Merge branch 'pailei2_mayue_bug20545' into 'pailei2'
Fix bug #20545.
See merge request easycorp/zentaopms!2167
|
2022-03-09 08:51:02 +00:00 |
|
|
mayue
|
00143907ce
|
Fix bug #20545.
|
2022-03-09 16:49:03 +08:00 |
|