Commit Graph
46401 Commits
Author SHA1 Message Date
tianshujie 4ee897dc0d * Fix bug #27494. 2022-11-07 10:50:32 +08:00
李玉春 e8b42deef3 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!6054
2022-11-07 02:06:22 +00:00
李玉春 9a5c92a275 Merge branch 'cyy_bug' into 'master'
* Fix bug #27589.

See merge request easycorp/zentaopms!6052
2022-11-07 02:05:01 +00:00
tianshujie 280a37559e * Fix bug #29293. 2022-11-07 10:03:47 +08:00
tianshujie 91f6d1b9f0 * Fix bug #29293. 2022-11-07 09:54:41 +08:00
caoyanyi ddfade7db2 * Fix bug #27589. 2022-11-07 09:50:00 +08:00
tianshujie 5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
tianshujie 0c3e7b8c70 * Fix bug #27978. 2022-11-07 09:33:24 +08:00
tianshujie 2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
孙广明 9f87785a72 Merge branch 'sprint/fixbug_liumengyi_29272' into 'master'
* Fix bug #29272.

See merge request easycorp/zentaopms!6051
2022-11-07 01:10:11 +00:00
liumengyi 0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
朱金勇 591cc27bb5 Merge branch 'sprint/xuanxuan' into 'master'
* Fix die error for xuanxuan.

See merge request easycorp/zentaopms!6048
2022-11-07 00:13:25 +00:00
Lufei 35ef023439 * Fix die error for xuanxuan. 2022-11-04 17:17:49 +08:00
李玉春 e0459b13cb Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29293.

See merge request easycorp/zentaopms!6047
2022-11-04 07:57:59 +00:00
tianshujie 26efc38fbb * Fix bug #29293. 2022-11-04 15:54:29 +08:00
孙广明 9d89b58f5d Merge branch 'fixbug' into 'master'
* Update picker select style for showimport.

See merge request easycorp/zentaopms!6045
2022-11-04 07:53:40 +00:00
tanghucheng 48cc91b414 * Update picker select style for showimport. 2022-11-04 15:52:03 +08:00
孙广明 12063da05e Merge branch 'master_bug_29290' into 'master'
* Fix bug #29290.

See merge request easycorp/zentaopms!6046
2022-11-04 07:48:01 +00:00
liuhong 1b7c9a9897 * Fix bug #29290. 2022-11-04 07:32:00 +00:00
孙广明 e153767b48 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #27253.

See merge request easycorp/zentaopms!6043
2022-11-04 07:20:44 +00:00
liyuchun 7e02324b22 * Fix bug #27253. 2022-11-04 15:17:49 +08:00
王怡栋 c5891b05c4 Merge branch 'fixbug' into 'master'
* Fix bug #29282.

See merge request easycorp/zentaopms!6040
2022-11-04 06:10:00 +00:00
tanghucheng bdf77c8831 * Fix bug #29282. 2022-11-04 13:57:51 +08:00
李玉春 7e1c52a0a7 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29260.

See merge request easycorp/zentaopms!6039
2022-11-04 05:41:42 +00:00
tianshujie f7c06e9935 * Fix bug #29260. 2022-11-04 13:36:00 +08:00
李玉春 7ed6f3a5fb Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6037
2022-11-04 05:05:55 +00:00
tianshujie 9363788155 * Fix bug #29280. 2022-11-04 11:31:32 +08:00
tianshujie d9ea15f286 * Fix bug #29276. 2022-11-04 11:26:54 +08:00
tianshujie cf7a678b9b * Fix bug #29280. 2022-11-04 11:25:06 +08:00
王怡栋 586eeb073c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #26290#29273

See merge request easycorp/zentaopms!6036
2022-11-04 03:14:03 +00:00
lanzongjun d1b7c675ba * fix bug #29273 2022-11-04 11:12:51 +08:00
tianshujie 8d7bcd38f9 * Fix bug #29281. 2022-11-04 11:08:31 +08:00
lanzongjun 506e752d0e * fix bug #26290 2022-11-04 11:04:06 +08:00
朱金勇 8fff18a3ea Merge branch 'sprint/fix-api' into 'master'
* Fix call api error.

See merge request easycorp/zentaopms!6025
2022-11-04 02:51:21 +00:00
鲁飞 95d10ea6d3 * Fix call api error. 2022-11-04 02:51:20 +00:00
李玉春 1f0c507278 Merge branch 'sprint/wangzemei/29269' into 'master'
* fix bug 29269

See merge request easycorp/zentaopms!6033
2022-11-04 02:34:54 +00:00
李玉春 7df502ace8 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!6035
2022-11-04 02:33:44 +00:00
tianshujie 2000dc8df2 * Fix bug #29278. 2022-11-04 10:31:04 +08:00
王怡栋 1a6694f1fe Merge branch 'sprint/hufangzhou_bug_29279' into 'master'
* Fix bug #29279.

See merge request easycorp/zentaopms!6034
2022-11-04 02:21:35 +00:00
王怡栋 19f4288a17 Merge branch 'sprint/hufangzhou_manual' into 'master'
* Change the zentao manual url.

See merge request easycorp/zentaopms!6021
2022-11-04 02:21:18 +00:00
tianshujie 3d40cba711 * Fix bug #29278. 2022-11-04 10:20:58 +08:00
王怡栋 ce8e9499a9 Merge branch 'sprint/fixbug_liumengyi_29249' into 'master'
* Fix bug #29249, and modify 'BI' to 'Statistics'.

See merge request easycorp/zentaopms!6032
2022-11-04 02:20:36 +00:00
tianshujie 787ba2ad2d * Fix bug #29247. 2022-11-04 10:17:00 +08:00
hufangzhou 23dd1b4384 * Fix bug #29279. 2022-11-04 02:11:14 +00:00
wangzemei 4256fb04e9 * fix bug 29269 2022-11-04 10:03:38 +08:00
孙广明 30ef18b393 Merge branch 'mayue_feedback#1339' into 'master'
* Fix bug #29238 and finsihed feedback#1339.

See merge request easycorp/zentaopms!6031
2022-11-04 02:00:16 +00:00
mayue 2be0a1f96c * Optimize code. 2022-11-04 09:57:30 +08:00
liumengyi 90d07d8261 * Fix bug #29249, and modify 'BI' to 'Statistics'. 2022-11-04 09:54:38 +08:00
孙广明 5c4cb5b1e2 Merge branch 'cyy_bug' into 'master'
* Hide pri style when value is null.

See merge request easycorp/zentaopms!6028
2022-11-04 01:53:41 +00:00
caoyanyi e49115a48a * Fix bug #29274. 2022-11-04 09:51:40 +08:00