wangyidong
|
9508d7729b
|
* code for bug #21400.
|
2022-04-27 09:55:50 +08:00 |
|
wangyidong
|
66df7b4990
|
* code for bug #15377.
|
2022-04-26 16:43:10 +08:00 |
|
wangxiaomeng
|
c49b50b422
|
fixbug_#21834.
|
2022-04-20 15:37:56 +08:00 |
|
xieqiyu
|
0eb4023b74
|
* Fix bug#13863.
|
2022-04-19 11:25:05 +08:00 |
|
xieqiyu
|
8ce20cb746
|
* Fix bug#14454.
|
2022-04-18 13:45:46 +08:00 |
|
王怡栋
|
323f7366ba
|
* code for bug #21020.
|
2022-04-18 13:26:25 +08:00 |
|
tanghucheng
|
3707793e40
|
* Fix bug for product index.
|
2022-04-15 15:27:46 +08:00 |
|
王怡栋
|
8f11396658
|
Merge branch 'fixbug' into 'master'
* Fix bug #17634.
See merge request easycorp/zentaopms!2962
|
2022-04-15 06:42:32 +00:00 |
|
tanghucheng
|
9761644a92
|
* Fix bug #17634.
|
2022-04-15 14:41:18 +08:00 |
|
王怡栋
|
1191d86cd4
|
Merge branch 'sprint/master_zhouxudong_17929' into 'master'
* Fix bug #17929.
See merge request easycorp/zentaopms!2947
|
2022-04-14 09:21:00 +00:00 |
|
xieqiyu
|
a7c8401684
|
* Fix bug#14454.
|
2022-04-14 16:45:28 +08:00 |
|
xieqiyu
|
f971ded6fd
|
* Fix bug#14454.
|
2022-04-14 16:13:18 +08:00 |
|
zhouxudong
|
68fbd1baf0
|
* Fix bug #17929.
|
2022-04-14 16:00:27 +08:00 |
|
孙广明
|
96aac66684
|
Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.
See merge request easycorp/zentaopms!2914
|
2022-04-13 08:22:07 +00:00 |
|
zhouxudong
|
61198c8486
|
* Fix bug #14189.
|
2022-04-13 15:40:09 +08:00 |
|
王怡栋
|
6e9c3a8afc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *21293
See merge request easycorp/zentaopms!2915
|
2022-04-13 06:49:48 +00:00 |
|
Zongjun Lan
|
0aa1cc9ad9
|
* fix bug *21293
|
2022-04-13 14:39:33 +08:00 |
|
xieqiyu
|
573fa80df6
|
* Fix bug#13127.
|
2022-04-13 14:00:25 +08:00 |
|
zhouxudong
|
20a9051148
|
* Fix bug #14891.
|
2022-04-13 11:23:29 +08:00 |
|
王怡栋
|
f6b236aed7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-13 10:02:05 +08:00 |
|
王怡栋
|
a9809c35aa
|
* code for bug #20823.
|
2022-04-13 10:01:36 +08:00 |
|
xieqiyu
|
f1aad53d14
|
* Fix bug#13127.
|
2022-04-12 13:20:26 +08:00 |
|
zhouxudong
|
da24c3abf9
|
* Fix bug #15442.
|
2022-04-08 09:21:39 +08:00 |
|
zhouxudong
|
3bf6c7fd5e
|
* Fix bug #15442.
|
2022-04-07 17:26:23 +08:00 |
|
Hao Sun
|
025a6f32b0
|
* bug #18928, fix switch button not work when statistic block place in right side.
|
2022-04-02 16:25:02 +08:00 |
|
李玉春
|
315c7e1041
|
Merge branch 'sprint/master_zhouxudong_13789' into 'master'
* Fix bug #13789.
See merge request easycorp/zentaopms!2739
|
2022-04-02 06:59:11 +00:00 |
|
李玉春
|
8329ed43fa
|
Merge branch 'devops24_zenggang' into 'master'
Fix bug#13131,16610
See merge request easycorp/zentaopms!2718
|
2022-04-02 06:32:21 +00:00 |
|
mayue
|
f54b38b241
|
* Fix bug #21435.
|
2022-04-02 10:15:33 +08:00 |
|
zhouxudong
|
4a82fa28cd
|
* Fix bug #13789.
|
2022-04-02 09:18:24 +08:00 |
|
zenggang
|
8c1b36fb3d
|
* Fix bug#13131,16610
|
2022-04-01 07:49:52 +00:00 |
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
王怡栋
|
dec6eba5b2
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21336,21296.
See merge request easycorp/zentaopms!2700
|
2022-04-01 03:29:18 +00:00 |
|
tanghucheng
|
b8aec834dd
|
* Fix bug #21296,21336.
|
2022-04-01 10:56:35 +08:00 |
|
zhouxudong
|
bd13abc6b4
|
* Fix bug #13765.
|
2022-04-01 10:47:35 +08:00 |
|
zhouxudong
|
0e710b9f82
|
* Fix bug #13765.
|
2022-04-01 09:36:18 +08:00 |
|
zenggang
|
40f9a85a6f
|
* Fix bug#21097,21096
|
2022-03-31 01:35:50 +00:00 |
|
tanghucheng
|
ab4053b372
|
* Fix bug#21208.
|
2022-03-28 13:50:48 +08:00 |
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +08:00 |
|
李玉春
|
7e0cf1500e
|
Merge branch 'fixbug_cyy' into 'master'
* Fix bug #19745.
See merge request easycorp/zentaopms!2555
|
2022-03-28 00:38:56 +00:00 |
|
caoyanyi
|
f58099b204
|
* Add app language.
|
2022-03-25 09:17:21 +08:00 |
|
hufangzhou
|
a3c79e6a10
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_package
|
2022-03-25 09:14:25 +08:00 |
|
hufangzhou
|
96de3c81b2
|
* Fix bug #21145.
|
2022-03-25 09:13:31 +08:00 |
|
tianshujie
|
9f3f0bd8c6
|
* Fix bug #20858.
|
2022-03-24 16:01:18 +08:00 |
|
liyuchun
|
57d6407fba
|
* Fix bug #13732.
|
2022-03-24 10:51:43 +08:00 |
|
李玉春
|
6729298c92
|
Merge branch 'bugfix_cyy' into 'master'
Modify app language and API
See merge request easycorp/zentaopms!2488
|
2022-03-24 00:29:54 +00:00 |
|
caoyanyi
|
b7b3a26e33
|
* Add app language.
|
2022-03-23 16:26:51 +08:00 |
|
王怡栋
|
fb917029b7
|
Merge branch 'fixbug' into 'master'
* Fix bug #21032.
See merge request easycorp/zentaopms!2478
|
2022-03-23 08:17:24 +00:00 |
|
tanghucheng
|
c9fc9cfc65
|
* Fix bug #21032.
|
2022-03-23 14:28:33 +08:00 |
|
孙广明
|
0c79df3fb6
|
Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug
See merge request easycorp/zentaopms!2461
|
2022-03-23 00:53:36 +00:00 |
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|