 孙广明
|
8ac4e2e2c5
|
Merge branch 'xieqiyu_fixbug' into 'master'
* Fix bug: click work sort error.
See merge request easycorp/zentaopms!1506
|
2022-01-19 09:30:57 +00:00 |
|
|
孙广明
|
74acc10e1c
|
Merge branch 'sprint/183_mayue_47996'
|
2022-01-19 17:27:09 +08:00 |
|
|
孙广明
|
aaa112c33b
|
Merge branch 'master' into 'sprint/183_mayue_47996'
# Conflicts:
# db/update16.2.sql
|
2022-01-19 09:29:23 +00:00 |
|
|
xieqiyu
|
93fa4d0468
|
* Fix bug: click work sort error.
|
2022-01-19 17:25:20 +08:00 |
|
|
mayue
|
7cb8fa1912
|
* Optimize code.
|
2022-01-19 17:23:27 +08:00 |
|
|
孙广明
|
f1dd5b30d0
|
Merge branch 'sprint/183_mayue_47979' into 'master'
* Finish task #47979.
See merge request easycorp/zentaopms!1505
|
2022-01-19 09:12:52 +00:00 |
|
|
mayue
|
29bedc7b1f
|
* Optimize code.
|
2022-01-19 17:10:09 +08:00 |
|
|
mayue
|
9150697408
|
* Finish task #47979.
|
2022-01-19 16:59:00 +08:00 |
|
|
liyuchun
|
7e96eb9f68
|
Merge branch 'devops19'
|
2022-01-19 16:55:57 +08:00 |
|
|
mayue
|
39b7da7355
|
* Finish task #47996.
|
2022-01-19 16:50:40 +08:00 |
|
|
孙广明
|
68fb902692
|
Merge branch 'sprint/183_tianshujie_48005' into 'master'
* Finish task #48005.
See merge request easycorp/zentaopms!1501
|
2022-01-19 08:44:06 +00:00 |
|
|
tianshujie
|
5bd18ec761
|
* Add conditional judgment.
|
2022-01-19 16:43:00 +08:00 |
|
|
tianshujie
|
131cdb614c
|
* Modify card query logic.
|
2022-01-19 16:33:57 +08:00 |
|
|
zhujinyong
|
74a9fedbd2
|
* Fix install function.
|
2022-01-19 16:22:44 +08:00 |
|
|
tianshujie
|
1c60beb471
|
* Finish task #48005.
|
2022-01-19 16:02:34 +08:00 |
|
|
tianshujie
|
2b08d2f07a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/183_tianshujie_48005
|
2022-01-19 16:02:27 +08:00 |
|
|
朱金勇
|
4665190e43
|
Merge branch 'sprint/183_zhouxudong_trans47955' into 'master'
Sprint/183 zhouxudong trans47955
See merge request easycorp/zentaopms!1500
|
2022-01-19 07:57:39 +00:00 |
|
|
周旭东
|
09ade37ec6
|
Update index.en.css
|
2022-01-19 07:52:31 +00:00 |
|
|
zhouxudong
|
93aafabf4f
|
*Finish task #47955 #47957.
|
2022-01-19 15:50:41 +08:00 |
|
|
zhouxudong
|
cb0b074717
|
*Finish task #47955 #47957.
|
2022-01-19 15:43:28 +08:00 |
|
|
朱金勇
|
4cb8d68e80
|
Merge branch 'sprint/183_zhouxudong_trans47958' into 'master'
*Finish task #47958.
See merge request easycorp/zentaopms!1497
|
2022-01-19 06:51:01 +00:00 |
|
|
zhouxudong
|
a7fa427b91
|
*Finish task #47958.
|
2022-01-19 14:29:23 +08:00 |
|
|
tianshujie
|
0adde5be67
|
* Remove useless code.
|
2022-01-19 13:56:50 +08:00 |
|
|
王怡栋
|
e535b6a423
|
Merge branch 'sprint/183_tianshujie_47981' into 'master'
* Finish task #47981.
See merge request easycorp/zentaopms!1495
|
2022-01-19 05:48:00 +00:00 |
|
|
tianshujie
|
caf4e77f84
|
* Finish task #47981.
|
2022-01-19 13:32:39 +08:00 |
|
|
孙广明
|
daf0d59227
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Fix bug and add sql file.
See merge request easycorp/zentaopms!1494
|
2022-01-19 05:16:34 +00:00 |
|
|
liumengyi
|
cca28df709
|
* Fix bug and add sql file.
|
2022-01-19 13:13:08 +08:00 |
|
|
孙广明
|
fdac2458cb
|
Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18481.
See merge request easycorp/zentaopms!1490
|
2022-01-19 03:17:59 +00:00 |
|
|
liumengyi
|
361d245ac6
|
* Remove useless variables.
|
2022-01-19 11:13:43 +08:00 |
|
|
liumengyi
|
2d10aedf4b
|
* Remove useless code.
|
2022-01-19 09:04:11 +08:00 |
|
|
孙广明
|
0c17431df8
|
Merge branch 'sprint/182_tianshujie_18692' into 'master'
* Fix bug #18692.
See merge request easycorp/zentaopms!1491
|
2022-01-19 01:02:24 +00:00 |
|
|
王怡栋
|
f3a6122cbe
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!1492
|
2022-01-19 01:01:42 +00:00 |
|
|
liumengyi
|
a1c6cfadcc
|
* Modify required item judgment method.
|
2022-01-19 09:01:29 +08:00 |
|
|
tianshujie
|
bb1d4c3839
|
* Adjust code of kanban.
|
2022-01-19 09:01:12 +08:00 |
|
|
孙广明
|
66a5f99982
|
* Fix bug.
|
2022-01-19 09:00:07 +08:00 |
|
|
tianshujie
|
f7d97ebe33
|
* Fix bug #18692.
|
2022-01-19 08:49:09 +08:00 |
|
|
zhujinyong
|
7d45eb3383
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
zentaopms_16.2
|
2022-01-19 08:33:08 +08:00 |
|
|
zhujinyong
|
50755210a3
|
Merge branch 'sprint/songchenxuan_testcase'
|
2022-01-19 08:30:44 +08:00 |
|
|
liumengyi
|
eb31aac6a1
|
* Encapsulation function for bug #18481.
|
2022-01-18 17:29:52 +08:00 |
|
|
liumengyi
|
8f924a7f05
|
* Fix bug #18481.
|
2022-01-18 17:23:54 +08:00 |
|
|
孙广明
|
e7e01ddecd
|
Merge branch 'sprint/182_hufangzhou_18687' into 'master'
* Fix bug #18687.
See merge request easycorp/zentaopms!1489
|
2022-01-18 08:24:56 +00:00 |
|
|
hufangzhou
|
9b139eb1a9
|
* Fix bug #18687.
|
2022-01-18 16:24:18 +08:00 |
|
|
孙广明
|
51b913511b
|
Merge branch 'sprint/182_tianshujie_bug' into 'master'
* Fix drag sort issue.
See merge request easycorp/zentaopms!1488
|
2022-01-18 08:19:51 +00:00 |
|
|
tianshujie
|
29e8966c33
|
* Fix drag sort issue.
|
2022-01-18 16:18:15 +08:00 |
|
|
王怡栋
|
3954c3469d
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!1487
|
2022-01-18 08:11:01 +00:00 |
|
|
孙广明
|
fa40efcc30
|
Merge branch 'sprint/182_tianshujie_18666' into 'master'
* Fix bug #18666.
See merge request easycorp/zentaopms!1485
|
2022-01-18 08:08:58 +00:00 |
|
|
孙广明
|
7299915e89
|
* Fix bug.
|
2022-01-18 16:08:13 +08:00 |
|
|
李玉春
|
a8564108dd
|
Merge branch 'devops_caoyanyi_testcase' into 'devops19'
cyy:Fix bug.
See merge request easycorp/zentaopms!1472
|
2022-01-18 08:01:41 +00:00 |
|
|
tianshujie
|
daf29be42b
|
* Fix bug #18520.
|
2022-01-18 16:01:25 +08:00 |
|
|
朱金勇
|
1a3020201f
|
Merge branch 'ztf_zhouxin_01' into 'master'
Add testcase for create and update method for productModel.
See merge request easycorp/zentaopms!1462
|
2022-01-18 08:01:10 +00:00 |
|