 孙广明
|
315b6352f1
|
Merge branch '15.6_tianshujie_43206' into '15.6'
* Finish task #43206.
See merge request easycorp/zentaopms!54
|
2021-10-13 00:39:33 +00:00 |
|
|
朱金勇
|
a7b043f7b2
|
Merge branch 'sprint/165_zenggang_15439' into '15.6'
Sprint/165 zenggang 15439
See merge request easycorp/zentaopms!52
|
2021-10-12 14:01:00 +00:00 |
|
|
hufangzhou
|
013b6a37cd
|
* Fix bug #15476.
|
2021-10-12 17:36:18 +08:00 |
|
|
hufangzhou
|
5e3863b284
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-12 15:43:02 +08:00 |
|
|
hufangzhou
|
a80eca0ab5
|
* Fix bug #15477.
|
2021-10-12 15:42:58 +08:00 |
|
|
王怡栋
|
edc45687fd
|
* fix error.
|
2021-10-12 14:54:35 +08:00 |
|
|
王怡栋
|
25737f9366
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-12 13:03:13 +08:00 |
|
|
王怡栋
|
ee892ef350
|
* fix for api.
|
2021-10-12 13:02:39 +08:00 |
|
|
hufangzhou
|
f89abbe31c
|
* Fix an error of demo data.
|
2021-10-12 11:22:59 +08:00 |
|
|
hufangzhou
|
8ff95d2d44
|
* Modify the demo data, delete the unused fields.
|
2021-10-12 10:57:38 +08:00 |
|
|
tianshujie
|
d6cea498cd
|
* Finish task #43206.
|
2021-10-12 10:33:07 +08:00 |
|
|
hufangzhou
|
bf78fe9be4
|
* Add the 15.6 version and upgrade.
zentaopms_15.6_20211012
|
2021-10-12 09:35:39 +08:00 |
|
|
王怡栋
|
eec51b9f69
|
* adjust for zentao sql.
|
2021-10-11 16:18:41 +08:00 |
|
|
王怡栋
|
e5132dcc3e
|
Merge branch '165'
|
2021-10-11 14:20:07 +08:00 |
|
|
王怡栋
|
f5f9772e08
|
Merge branch 'sprint/165_test' into 165
|
2021-10-11 14:15:54 +08:00 |
|
|
zenggang
|
e7f819ac53
|
* Adjust code variable name
|
2021-10-11 01:16:15 +00:00 |
|
|
liyuchun
|
cf687f3ee5
|
* Adjust of zt_dept.
|
2021-10-11 08:51:56 +08:00 |
|
|
朱金勇
|
c280d772c2
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* fix for todo data.
See merge request easycorp/zentaopms!46
|
2021-10-10 14:13:27 +00:00 |
|
|
朱金勇
|
b90e78d4c9
|
Merge branch 'sprint/165_liyuchun_42859' into 'sprint/165'
* Finish task #42859，modify the syntax of Notification.
See merge request easycorp/zentaopms!47
|
2021-10-10 12:08:18 +00:00 |
|
|
zenggang
|
0b7c8943c0
|
* Fix bug#15438
|
2021-10-09 09:11:02 +00:00 |
|
|
dingna
|
f7cd95e318
|
* Modify desc of products.
|
2021-10-09 16:54:01 +08:00 |
|
|
dingna
|
1ac46abd23
|
* Modify name of products.
|
2021-10-09 15:29:20 +08:00 |
|
|
liyuchun
|
5945717a55
|
* Fix bug #42859.
|
2021-10-09 15:22:57 +08:00 |
|
|
dingna
|
5d94e8e207
|
* Modify product of branch and add created time for products.
|
2021-10-09 14:47:41 +08:00 |
|
|
孙广明
|
bb268a2bf6
|
* Merge code.
|
2021-10-09 13:56:42 +08:00 |
|
|
hufangzhou
|
e23e7975a3
|
Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test
|
2021-10-09 13:20:44 +08:00 |
|
|
hufangzhou
|
a187e11d52
|
* Modify the name of build and release in yaml file.
|
2021-10-09 13:20:38 +08:00 |
|
|
xieqiyu
|
40a362c7f2
|
* Add data of deleted products.
|
2021-10-09 13:13:19 +08:00 |
|
|
hufangzhou
|
39d8d91ade
|
Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test
|
2021-10-09 10:51:05 +08:00 |
|
|
hufangzhou
|
948c0ef88a
|
Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test
|
2021-10-09 10:50:43 +08:00 |
|
|
hufangzhou
|
0e15bc92cb
|
* Modify the build yaml and release yaml.
|
2021-10-09 10:50:34 +08:00 |
|
|
tianshujie
|
988dcea07e
|
* Add independent project linked product data.
|
2021-10-09 10:50:03 +08:00 |
|
|
王怡栋
|
e99daf2900
|
* fix for todo data.
|
2021-10-09 10:41:00 +08:00 |
|
|
孙广明
|
7045bcfcac
|
* Adjust productplan and user yaml.
|
2021-10-09 10:40:27 +08:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
xieqiyu
|
267fd9b1d4
|
* Delete the owner of the product with the same project name.
|
2021-10-09 10:05:16 +08:00 |
|
|
zhujinyong
|
6abe8d32a2
|
Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test
|
2021-10-09 09:34:05 +08:00 |
|
|
dingna
|
d3611fd8a9
|
* Add products with the same name as project.
|
2021-10-09 09:32:33 +08:00 |
|
|
朱金勇
|
ff09127219
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.
See merge request easycorp/zentaopms!41
|
2021-10-09 01:32:30 +00:00 |
|
|
zhujinyong
|
bc33f19a67
|
+ Add postfix for debug.
|
2021-10-09 09:30:16 +08:00 |
|
|
王怡栋
|
0fa52d3318
|
* adjust for review code.
|
2021-10-09 09:29:10 +08:00 |
|
|
tianshujie
|
3f163029be
|
Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test
|
2021-10-09 09:25:34 +08:00 |
|
|
tianshujie
|
fd80fb2889
|
* Fixed zt_block table for inserting data.
|
2021-10-09 09:23:01 +08:00 |
|
|
朱金勇
|
85fb57086c
|
Merge branch 'sprint/165_tianshujie_42867' into 'sprint/165'
*Finish task #42867
See merge request easycorp/zentaopms!43
|
2021-10-09 01:21:22 +00:00 |
|
|
孙广明
|
9cf1f6e09d
|
* Adjust user.yaml.
|
2021-10-09 09:14:42 +08:00 |
|
|
朱金勇
|
4e0207d7e4
|
Merge branch 'sprint/165_zenggang' into 'sprint/165'
Sprint/165 zenggang
See merge request easycorp/zentaopms!40
|
2021-10-09 01:10:05 +00:00 |
|
|
zenggang
|
bf16a12c7b
|
* Fix bug#15439
|
2021-10-09 01:05:07 +00:00 |
|
|
leiyong
|
7bef6061fe
|
Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_leiyong
|
2021-10-08 15:16:19 +08:00 |
|
|
leiyong
|
bf8b850e63
|
* Add yaml file.
|
2021-10-08 15:15:46 +08:00 |
|
|
hufangzhou
|
4654a827dd
|
Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test
|
2021-10-08 15:02:53 +08:00 |
|