Commit Graph

28836 Commits

Author SHA1 Message Date
hufangzhou
40d488317e * Optimize the implementation of jira data import interface. 2022-02-15 12:00:28 +08:00
孙广明
abf746ad62 Merge branch 'sprint/184_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!1801
2022-02-15 02:17:39 +00:00
王怡栋
af7fcb8a45 Merge branch 'sgm_jira' into 'master'
Sgm jira

See merge request easycorp/zentaopms!1804
2022-02-15 02:15:31 +00:00
孙广明
6af0d96e29 * Fix jira style. 2022-02-15 10:11:07 +08:00
孙广明
9e9a9f1735 * Code for jira. 2022-02-15 08:49:42 +08:00
hufangzhou
aaeeaf1743 * Add the new version. 2022-02-15 08:47:29 +08:00
李玉春
33758cf613 Merge branch 'sprint/fixbug_zxd_18593' into 'master'
*Fix bug #18593.

See merge request easycorp/zentaopms!1797
2022-02-15 00:18:58 +00:00
李玉春
4f902838dc Merge branch 'sprint/fixbug_zxd_13636' into 'master'
*Fix bug #13636.

See merge request easycorp/zentaopms!1796
2022-02-15 00:18:37 +00:00
李玉春
d4aa695c16 Merge branch 'sprint/fixbug_zxd_19293' into 'master'
*Fix bug #19293.

See merge request easycorp/zentaopms!1794
2022-02-15 00:17:34 +00:00
zhouxudong
c21f887cbc *Fix bug #18593. 2022-02-14 17:11:05 +08:00
李玉春
f5e6c7bfc3 Merge branch 'devops21_zhangzilong_19249' into 'master'
*Code for bug #19249.

See merge request easycorp/zentaopms!1792
2022-02-14 09:02:48 +00:00
zhangzilong
5fa094a130 * Code for bug #19249. 2022-02-14 17:00:40 +08:00
zhouxudong
b356c5fda0 *Fix bug #19293. 2022-02-14 16:59:47 +08:00
zhangzilong
e160e76018 * Code for bug #19249. 2022-02-14 16:58:59 +08:00
李玉春
679e06a7d0 Merge branch 'devops21_zhangzilong_19255' into 'master'
* Code for bug #19255.

See merge request easycorp/zentaopms!1791
2022-02-14 08:52:02 +00:00
zhouxudong
c7211f7164 *Fix bug #13636. 2022-02-14 16:50:33 +08:00
朱金勇
3de08ec30e Merge branch 'sprint/scx_deletelang' into 'master'
*Delete lang.

See merge request easycorp/zentaopms!1779
2022-02-14 08:46:07 +00:00
songchenxuan
91f3e14e68 *Delete lang. 2022-02-14 16:44:23 +08:00
李玉春
fce527f596 Merge branch 'devops_cyy_case' into 'master'
* Modify test case error.

See merge request easycorp/zentaopms!1787
2022-02-14 08:31:14 +00:00
zhangzilong
921e887dbe * Code for bug #19255. 2022-02-14 16:30:03 +08:00
hufangzhou
ba007e614c * Code for task #48760. 2022-02-14 15:55:29 +08:00
caoyanyi
7fc3b6d4e9 * Modify test case. 2022-02-14 15:19:07 +08:00
李玉春
bc643436ab Merge branch 'sprint/fixbug_zxd_19424' into 'master'
Fix bug #19424.

See merge request easycorp/zentaopms!1776
2022-02-14 06:58:21 +00:00
李玉春
eeefcf84ab Merge branch 'sunhuawei_fixbug_19425' into 'master'
Fix bug #19425.

See merge request easycorp/zentaopms!1786
2022-02-14 06:56:36 +00:00
孙华伟
aa3b14326c Fix bug #19425. 2022-02-14 14:53:32 +08:00
zhangzilong
0aa0fb2b6c * Fix bug #19249. 2022-02-14 14:45:56 +08:00
songchenxuan
7a9f363287 Delete lang. 2022-02-14 14:43:25 +08:00
李玉春
2a5b157a7f Merge branch 'sprint/fixbug_zxd_19460' into 'master'
*Fux bug #19460 #19458.

See merge request easycorp/zentaopms!1784
2022-02-14 06:40:59 +00:00
孙华伟
b54a465321 Fix bug #19245. 2022-02-14 14:39:33 +08:00
孙华伟
8ae7893955 Fix bug #19425. 2022-02-14 14:38:19 +08:00
孙华伟
97923aace8 Fix bug #19425. 2022-02-14 14:36:00 +08:00
hufangzhou
64f8980289 * Fix bug #19506. 2022-02-14 13:57:52 +08:00
周旭东
3b88357aad Update model.php 2022-02-14 05:22:36 +00:00
周旭东
a50c77de55 Update control.php 2022-02-14 05:20:41 +00:00
zhouxudong
a13a78f7bb *Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458. 2022-02-14 13:17:45 +08:00
李玉春
e6db39683a Merge branch 'devops21_zhangzilong_19319' into 'master'
# Fix bug #19319.

See merge request easycorp/zentaopms!1782
2022-02-14 03:28:55 +00:00
zhangzilong
3a545530a6 * Code for bug #19319. 2022-02-14 11:28:01 +08:00
zhangzilong
1195ff854b * Fix bug #19319. 2022-02-14 11:20:41 +08:00
zhangzilong
127c3ff36a * Code for bug #19319. 2022-02-14 11:16:23 +08:00
zhangzilong
bb828d54cf * Code for bug #19319. 2022-02-14 11:13:24 +08:00
李玉春
b14ff591f6 Merge branch 'devops_cyy_bug' into 'master'
* Modify api get group param.

See merge request easycorp/zentaopms!1783
2022-02-14 03:04:46 +00:00
caoyanyi
e4429fbadb * Modify api get group param. 2022-02-14 11:02:07 +08:00
王怡栋
ebb1e279ad Merge branch 'sgm_jira' into 'master'
Sgm jira

See merge request easycorp/zentaopms!1780
2022-02-14 02:57:36 +00:00
zhangzilong
106447b401 * Fix bug #19319. 2022-02-14 10:56:50 +08:00
孙广明
62801e23d7 * Fix details. 2022-02-14 10:56:20 +08:00
孙广明
53894c8ae5 Merge branch 'sprint/184_hufangzhou_19471' into 'master'
* Fix bug #19471.

See merge request easycorp/zentaopms!1781
2022-02-14 02:55:03 +00:00
hufangzhou
82895b18d2 * Fix bug #19471. 2022-02-14 10:50:06 +08:00
孙广明
c2859341fd * Fix jira bug. 2022-02-14 10:47:13 +08:00
zhangzilong
dcdfb0cdee * Fix bug #19319. 2022-02-14 10:32:12 +08:00
liyuchun
5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00