Commit Graph
38806 Commits
Author SHA1 Message Date
lanzongjun 63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
孙广明 3e677efa79 Merge branch 'sprint/189_mayue_fixbug#22411' into 'master'
* Fix bug #22411.

See merge request easycorp/zentaopms!3370
2022-05-12 08:53:13 +00:00
mayue 44783b57a5 * Optimize code. 2022-05-12 08:52:17 +00:00
唐胡成 719db9f013 Update update16.5.sql 2022-05-12 08:49:01 +00:00
王怡栋 57b96215b3 Merge branch 'sprint/189_hufangzhou_issue' into 'master'
* Resolve issue #634.

See merge request easycorp/zentaopms!3369
2022-05-12 08:48:06 +00:00
tanghucheng 36d4e294e7 * Fix bug. 2022-05-12 08:46:51 +00:00
王怡栋 42473b2dfb Merge branch 'sprint/tianshujie_bug22436' into 'master'
* Fix bug #22436.

See merge request easycorp/zentaopms!3371
2022-05-12 08:44:42 +00:00
mayue 96b422d247 * Fix bug #22411. 2022-05-12 08:41:39 +00:00
tianshujie 85469bca87 * Fix bug #22436. 2022-05-12 16:34:23 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00
王怡栋 93e5d9e108 Merge branch 'sprint/wangyuting_workflow' into 'master'
* Fix print extend fields bug.

See merge request easycorp/zentaopms!3362
2022-05-12 07:59:55 +00:00
王怡栋 7a15492b56 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3364
2022-05-12 07:56:03 +00:00
李玉春 d618aea1ee Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3368
2022-05-12 07:55:25 +00:00
王怡栋 125a97d530 Merge branch 'sprint/189_hufangzhou_22429' into 'master'
* Fix bug #22429.

See merge request easycorp/zentaopms!3366
2022-05-12 07:55:10 +00:00
王怡栋 66eb00606e Merge branch 'sprint/189_hufangzhou_22399' into 'master'
* Fix bug #22399.

See merge request easycorp/zentaopms!3367
2022-05-12 07:53:53 +00:00
wangyidong 450a61cf12 * fix bug #22415. 2022-05-12 15:52:24 +08:00
wangyidong aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
hufangzhou a8ce3a757d * Fix bug #22399. 2022-05-12 15:51:02 +08:00
tianshujie 10e48b66d9 * Fix bug #22378. 2022-05-12 15:50:05 +08:00
hufangzhou 4c7619bcb9 * Fix bug #22429. 2022-05-12 15:46:49 +08:00
zhouxudong c902075102 * Add compile auto test. 2022-05-12 07:41:09 +00:00
孙广明 dd4566f1ea Merge branch 'fixbug_sunjun_22349' into 'master'
*Fixbug_sunjun_22349

See merge request easycorp/zentaopms!3356
2022-05-12 07:36:26 +00:00
孙广明 cac35c816c Merge branch 'fixbug_sunjun_22394' into 'master'
*Fixbug_sunjun_22394

See merge request easycorp/zentaopms!3363
2022-05-12 07:36:17 +00:00
孙广明 f4724390f6 Merge branch 'sunhuawei_fixbug' into 'master'
*解决功能演示过程中出现的问题。

See merge request easycorp/zentaopms!3365
2022-05-12 07:36:01 +00:00
孙华伟 a3ab4a596b *解决功能演示过程中出现的问题。 2022-05-12 15:29:28 +08:00
tanghucheng 4be4e591c5 * Fix bug. 2022-05-12 07:22:39 +00:00
sunjun 276ddada57 *Fixbug_sunjun_22394 2022-05-12 07:07:42 +00:00
sunjun cb00a3b8ac *Fixbug_sunjun_22349 2022-05-12 07:05:20 +00:00
sunjun 8732d9bcd3 *Fixbug_sunjun_22349 2022-05-12 07:01:30 +00:00
wangyuting2 58c08b95a6 * Fix print extend fields bug. 2022-05-12 14:10:10 +08:00
王怡栋 fa0b10275e Merge branch 'sprint/daitingting_fix_isClickable' into 'master'
* Check execution privilege in buildOperateMenu function.

See merge request easycorp/zentaopms!3360
2022-05-12 06:06:05 +00:00
孙广明 52697b7a3c Merge branch 'sprint/189_mayue_fixbug#22412' into 'master'
* Fix bug #22412.

See merge request easycorp/zentaopms!3361
2022-05-12 05:57:18 +00:00
mayue f15f8f0345 * Fix bug #22412. 2022-05-12 05:55:25 +00:00
daitingting da18989aa2 * Remove testin codes. 2022-05-12 05:55:14 +00:00
daitingting e99212a7bc * Check execution privilege in buildOperateMenu function. 2022-05-12 05:52:16 +00:00
wangyidong c04ec4db8f * fix for merge program when upgrade. 2022-05-12 13:46:57 +08:00
孙广明 03ee11e67f Merge branch 'sprint/189_mayue_task#53652' into 'master'
* Fix bug #22411.

See merge request easycorp/zentaopms!3359
2022-05-12 05:45:50 +00:00
王怡栋 4bae11dbc6 Merge branch 'sprint/wangyuting_workflow' into 'master'
* Fix workflow bug.

See merge request easycorp/zentaopms!3357
2022-05-12 05:42:14 +00:00
mayue 53638cb9f2 * Fix bug. 2022-05-12 05:40:39 +00:00
王怡栋 9cd2982d2e Merge branch 'sprint/189_hufangzhou_22364' into 'master'
* Fix bug #22364.

See merge request easycorp/zentaopms!3358
2022-05-12 05:38:14 +00:00
hufangzhou d99acc8cf8 * Remove the unused code. 2022-05-12 13:37:11 +08:00
wangyuting2 34609e9036 * Optimize code. 2022-05-12 13:33:56 +08:00
李玉春 70fcf381cf Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365

See merge request easycorp/zentaopms!3352
2022-05-12 05:33:28 +00:00
王怡栋 440891b197 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add sql

See merge request easycorp/zentaopms!3349
2022-05-12 05:29:51 +00:00
hufangzhou 80124c681e * Fix bug #22364. 2022-05-12 13:29:39 +08:00
wangyuting2 28f4a384ee * Add biz version judgment conditions. 2022-05-12 13:27:41 +08:00
孙华伟 3de0b23ab8 *Optimize the bug. 2022-05-12 13:26:19 +08:00
孙华伟 9c2926f59a *Optimize the code. 2022-05-12 13:23:11 +08:00
孙华伟 6c2b318da4 *Optimize the code. 2022-05-12 13:21:44 +08:00
wangyidong c0f53c6740 Merge branch 'sprint/189_zhouxudong_53651' 2022-05-12 13:20:50 +08:00