 zenggang
|
5bad1b3167
|
* Code for task #57907
|
2022-06-22 01:26:42 +00:00 |
|
|
孙广明
|
0234c82b19
|
Merge branch 'sprint/206_tianshujie_lang' into 'master'
* Finish story #32623.
See merge request easycorp/zentaopms!4048
|
2022-06-22 01:12:35 +00:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
wangyidong
|
f0ff649fa5
|
* add zentaomax sql to zentao.sql.
|
2022-06-22 08:33:43 +08:00 |
|
|
孙广明
|
34ddc497ba
|
Merge branch 'zentaopms_207'
|
2022-06-22 08:33:17 +08:00 |
|
|
wangyidong
|
3e4a4668af
|
Merge branch 'zentaomax34'
|
2022-06-22 08:20:28 +08:00 |
|
|
朱金勇
|
89357c1100
|
Merge branch 'sprint/wangzemei/bug23265' into 'master'
* Fix bug #23265
See merge request easycorp/zentaopms!4045
|
2022-06-22 00:15:59 +00:00 |
|
|
朱金勇
|
1b8d0637b5
|
Merge branch 'sprint/wangzemei/bug24000' into 'master'
* Fix bug #24000
See merge request easycorp/zentaopms!4041
|
2022-06-22 00:15:48 +00:00 |
|
|
朱金勇
|
3ec3e6d29a
|
Merge branch 'sprint/gfl_fix_bug_#23659' into 'master'
* fix bug #23659
See merge request easycorp/zentaopms!4020
|
2022-06-22 00:15:37 +00:00 |
|
|
王怡栋
|
91ec091aa4
|
Merge branch 'sgm_fixbug' into 'zentaopms_207'
* Fix bug for release pager.
See merge request easycorp/zentaopms!4046
|
2022-06-21 09:33:35 +00:00 |
|
|
王怡栋
|
5b8a07d88f
|
Merge branch 'sprint/205_hufangzhou_57882' into 'master'
* Finish task #57882, #57874, #57873, #57855.
See merge request easycorp/zentaopms!4047
|
2022-06-21 09:33:11 +00:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
|
孙广明
|
3b7746915f
|
* Fix bug for release pager.
|
2022-06-21 17:16:24 +08:00 |
|
|
wangzemei
|
0f30bd5fd9
|
* Fix bug #23265
|
2022-06-21 09:11:46 +00:00 |
|
|
王怡栋
|
9f25b9cbb3
|
Merge branch 'sgm_fixbug' into 'zentaopms_207'
* Code for bug #24007.
See merge request easycorp/zentaopms!4044
|
2022-06-21 08:22:37 +00:00 |
|
|
孙广明
|
dab3b7eab2
|
Merge branch 'sprint/207_mayue_bug#23765' into 'zentaopms_207'
* Fix bug #23765.
See merge request easycorp/zentaopms!4037
|
2022-06-21 07:24:12 +00:00 |
|
|
mayue
|
a0fd431401
|
* Optimize code.
|
2022-06-21 15:23:12 +08:00 |
|
|
孙广明
|
5f26b603e7
|
* Code for bug #24007.
|
2022-06-21 15:22:12 +08:00 |
|
|
wangyidong
|
541f9dd0d1
|
* code for bug #58034.
|
2022-06-21 14:53:45 +08:00 |
|
|
孙广明
|
636cda107c
|
Merge branch 'sprint207_57903' into 'zentaopms_207'
* Finish task#57903
See merge request easycorp/zentaopms!4029
|
2022-06-21 06:49:11 +00:00 |
|
|
孙广明
|
b0a9a2d7f0
|
Merge branch 'sprint/207_zg_57907' into 'zentaopms_207'
* Finish task #57907，57909
See merge request easycorp/zentaopms!4035
|
2022-06-21 06:44:58 +00:00 |
|
|
王怡栋
|
4a09c0e82c
|
Merge branch 'sgm_fixbug' into 'master'
* Finish task #57904.
See merge request easycorp/zentaopms!4034
(cherry picked from commit 7009548c68)
f5ff0975 * Finish task #57904.
|
2022-06-21 06:28:33 +00:00 |
|
|
王怡栋
|
83ecf656d3
|
Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.
See merge request easycorp/zentaopms!4033
(cherry picked from commit beaddb012c)
f0c23584 * Code for feedback #397.
|
2022-06-21 06:28:13 +00:00 |
|
|
王怡栋
|
c30ba304ab
|
Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
zentaopms_17.1
|
2022-06-21 06:25:45 +00:00 |
|
|
王怡栋
|
319eda5854
|
Revert "Merge branch 'sgm_fixbug' into 'master'"
This reverts merge request !4034
|
2022-06-21 06:25:08 +00:00 |
|
|
王怡栋
|
7009548c68
|
Merge branch 'sgm_fixbug' into 'master'
* Finish task #57904.
See merge request easycorp/zentaopms!4034
|
2022-06-21 06:09:37 +00:00 |
|
|
wangzemei
|
b11a919ccd
|
* Fix bug #24000
|
2022-06-21 06:08:36 +00:00 |
|
|
王怡栋
|
beaddb012c
|
Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.
See merge request easycorp/zentaopms!4033
|
2022-06-21 06:07:46 +00:00 |
|
|
王怡栋
|
63cb3033df
|
Merge branch 'sprint/34_tanghucheng' into 'sprint/zentaomax34'
* Add menuorder for custom setting.
See merge request easycorp/zentaopms!4031
|
2022-06-21 06:04:59 +00:00 |
|
|
mayue
|
d97b5aeb97
|
* Fix bug #23765.
|
2022-06-21 13:30:00 +08:00 |
|
|
zenggang
|
fae27b266a
|
* Finish task #57909
|
2022-06-21 03:26:37 +00:00 |
|
|
zenggang
|
b761aa029b
|
* Finish task #57907
|
2022-06-21 02:50:55 +00:00 |
|
|
孙广明
|
f5ff0975f8
|
* Finish task #57904.
|
2022-06-21 10:50:21 +08:00 |
|
|
孙广明
|
f0c23584e0
|
* Code for feedback #397.
|
2022-06-21 10:23:58 +08:00 |
|
|
tanghucheng
|
98d4d45079
|
* Add menuorder for custom setting.
|
2022-06-21 10:10:25 +08:00 |
|
|
guofeilong
|
bb893c33fb
|
* Fix bug #23659
|
2022-06-21 01:47:28 +00:00 |
|
|
zenggang
|
dff6937dc4
|
* Adjust code
|
2022-06-20 09:29:29 +00:00 |
|
|
zenggang
|
2564d2d60b
|
* Finish task#57903
|
2022-06-20 09:27:56 +00:00 |
|
|
王怡栋
|
0f0fd55ba3
|
Merge branch 'fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!4025
|
2022-06-20 08:55:48 +00:00 |
|
|
tanghucheng
|
bd259de8ca
|
* Fix bug .
|
2022-06-20 16:54:25 +08:00 |
|
|
孙广明
|
dc87c34cfd
|
Merge branch 'sgm_fixbug' into 'master'
* Fix misc-ping bug.
See merge request easycorp/zentaopms!4023
|
2022-06-20 08:05:49 +00:00 |
|
|
孙广明
|
82245e8a88
|
* Fix misc-ping bug.
|
2022-06-20 16:04:07 +08:00 |
|
|
王怡栋
|
4739911510
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766
See merge request easycorp/zentaopms!4022
|
2022-06-20 07:49:59 +00:00 |
|
|
朱金勇
|
e07244e67e
|
Merge branch 'sprint/wangzemei/bug23919' into 'master'
* fix bug 23919
See merge request easycorp/zentaopms!4021
|
2022-06-20 07:49:56 +00:00 |
|
|
lanzongjun
|
d5afe20770
|
* fix bug #23766
|
2022-06-20 15:46:10 +08:00 |
|
|
zhujinyong
|
0f311a2e2b
|
* Fix recTotal of product list.
|
2022-06-20 15:25:18 +08:00 |
|
|
zhujinyong
|
03b12b84f1
|
* Fix count of product.
|
2022-06-20 15:19:38 +08:00 |
|
|
guofeilong
|
a76044dff8
|
* fix bug #23659
|
2022-06-20 07:18:41 +00:00 |
|
|
孙广明
|
ada76d79ac
|
Merge branch 'sprint/scx_commonlang' into 'master'
Sprint/scx commonlang
See merge request easycorp/zentaopms!4019
|
2022-06-20 07:12:20 +00:00 |
|
|
宋辰轩
|
9460102a29
|
* Format.
|
2022-06-20 15:11:29 +08:00 |
|