 王怡栋
|
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 |
|
|
孙广明
|
3b7746915f
|
* Fix bug for release pager.
|
2022-06-21 17:16:24 +08: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 |
|
|
孙广明
|
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 |
|
|
王怡栋
|
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 |
|
|
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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
宋辰轩
|
0b83f28fe9
|
* CommonLang.
|
2022-06-20 15:09:59 +08:00 |
|
|
wangzemei
|
f81ffb5c98
|
* fix bug 23919
|
2022-06-20 06:07:39 +00:00 |
|
|
王怡栋
|
946d5cb782
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766
See merge request easycorp/zentaopms!4015
|
2022-06-20 03:18:59 +00:00 |
|
|
王怡栋
|
233d78e4b7
|
Merge branch 'fixbug' into 'master'
* Fix bug #23908,23888.
See merge request easycorp/zentaopms!4016
|
2022-06-20 03:18:37 +00:00 |
|
|
lanzongjun
|
6786b4d08c
|
* fix bug #23932
|
2022-06-20 11:17:34 +08:00 |
|
|
tanghucheng
|
09268cfe23
|
* Fix bug .
|
2022-06-20 10:50:54 +08:00 |
|
|
lanzongjun
|
2c49643589
|
* fix bug #23766
|
2022-06-20 09:40:46 +08:00 |
|
|
lanzongjun
|
898bb949c1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-06-20 09:30:53 +08:00 |
|
|
zhujinyong
|
c2bff85082
|
* Fix fail of ciresult.
|
2022-06-20 08:50:47 +08:00 |
|
|
孙广明
|
11c5cd1999
|
Merge branch 'sprint/sunhao/apps_loading_state'
|
2022-06-18 00:10:31 +08:00 |
|
|
Hao Sun
|
584bf73577
|
* update zui lib.
|
2022-06-17 15:54:16 +00:00 |
|
|
Hao Sun
|
ef0f9634be
|
* add loading indicator on loading apps.
|
2022-06-17 15:35:36 +00:00 |
|
|
孙广明
|
4f9388e5e6
|
Merge branch 'sprint/sunhao/optimize_program_list' into 'master'
* fix table with nested option not work as expected.
See merge request easycorp/zentaopms!4013
|
2022-06-17 15:24:25 +00:00 |
|
|
Hao Sun
|
a8d212e213
|
* fix table with nested option not work as expected.
|
2022-06-17 15:18:08 +00:00 |
|
|
王怡栋
|
619c03be5d
|
Merge branch 'sgm_fixbug' into 'master'
* Code for product order.
See merge request easycorp/zentaopms!4012
|
2022-06-17 08:26:27 +00:00 |
|
|
孙广明
|
9ac3ed7851
|
* Code for product order.
|
2022-06-17 16:23:46 +08:00 |
|
|
王怡栋
|
e2439f2a5c
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23891.
See merge request easycorp/zentaopms!4011
|
2022-06-17 08:19:30 +00:00 |
|
|
孙广明
|
6ff93fcc13
|
Merge branch 'sprint/sunhao/optimize_program_list' into 'master'
* optimize program list, support to preserve nested state.
See merge request easycorp/zentaopms!4010
|
2022-06-17 08:06:58 +00:00 |
|