Commit Graph

79 Commits

Author SHA1 Message Date
caoqianming a95dcdc77c fix conflict 2020-09-15 15:34:46 +08:00
caoqianming 3488189141 access 2020-09-15 15:32:19 +08:00
shilixia 2ea1d5b1c6 tijiaoshenghe 2020-09-15 15:11:38 +08:00
shilixia 6b37154bc4 tijiaoguanlitixi 2020-09-14 10:31:10 +08:00
caoqianming f3eb3f2ead audit certapp 2020-09-14 09:59:25 +08:00
shilixia 4004d7c5c1 gengxinneiron 2020-09-02 11:14:45 +08:00
caoqianming 2a6fe56ed1 plan 2020-09-02 11:12:51 +08:00
caoqianming 328ea10969 pagination 2020-08-24 11:11:56 +08:00
caoqianming f84dfc3cc0 fix conflict 2020-08-21 15:55:21 +08:00
caoqianming 0487fac0c2 项目制定 2020-08-21 15:52:15 +08:00
shilixia cadd1bc4bb xiugaiyangshi 2020-08-21 15:48:28 +08:00
shilixia 2f317bd32c yangshi 2020-08-21 09:32:31 +08:00
caoqianming 0a551786c3 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-08-14 09:56:49 +08:00
caoqianming 548159edfe vue index 2020-08-14 09:51:18 +08:00
shilixia 8f08df1eb5 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-08-13 16:00:09 +08:00
shilixia d5bc101d0a xialashengqing 2020-08-13 15:59:59 +08:00
caoqianming 49c03ea4e7 cccform 2020-08-13 15:58:12 +08:00
shilixia 0a5d76fd09 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-08-10 14:27:15 +08:00
shilixia e288171467 xialaneirong 2020-08-10 14:26:45 +08:00
caoqianming 9c8ce37b46 application update 2020-08-10 14:16:27 +08:00
caoqianming 3f1a347346 dict update 2020-08-07 10:42:01 +08:00
shilixia 858049d38e 组织修改 2020-08-04 16:08:17 +08:00
caoqianming 54896344ee Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-31 14:49:49 +08:00
caoqianming 8534ee12fb project table 2020-07-31 14:49:37 +08:00
shilixia 4d0b238db8 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-29 14:55:06 +08:00
caoqianming 27adf6cd5e application evaluation 2020-07-29 14:54:44 +08:00
shilixia b278a94ea5 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-29 14:51:30 +08:00
shilixia 9b0eed21a0 tijiaopeixun 2020-07-29 14:51:19 +08:00
caoqianming 31d2755256 application evalutaion 2020-07-29 14:48:35 +08:00
caoqianming c2af958fd2 xx 2020-07-28 11:48:40 +08:00
caoqianming dd7f9663da obj perm 2020-07-24 10:37:00 +08:00
shilixia 2be68645fd tijiaopeixun 2020-07-24 10:27:08 +08:00
shilixia 43e8d798e9 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-24 09:08:01 +08:00
caoqianming 9844ec1fad employee search part1 2020-07-17 11:37:46 +08:00
shilixia 322e3ee0da Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-16 17:43:20 +08:00
shilixia 76b442e5db xuanzzeqi 2020-07-16 17:42:53 +08:00
caoqianming 64cd8cce4d employee ability education qualification complete 2020-07-16 12:03:07 +08:00
shilixia bd1255c47b peixun 2020-07-14 09:25:59 +08:00
shilixia de204dffca Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-10 16:53:04 +08:00
shilixia 25a8c140e0 pull人员内容 2020-07-10 16:52:48 +08:00
caoqianming 705f6bc6b9 employee 2020-07-10 16:50:19 +08:00
shilixia 63cc990a36 zhuzhixinxi 2020-07-10 08:56:04 +08:00
caoqianming c8c216e0ef employee 2020-07-10 08:54:35 +08:00
shilixia 400fbf6a56 pull 2020-07-08 16:00:08 +08:00
shilixia b6034728fd Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-06 10:20:02 +08:00
shilixia 6bfc3e0023 zuzhixinxi 2020-07-06 10:17:15 +08:00
caoqianming d87a7f20c6 rbacfilterset 2020-07-06 10:14:20 +08:00
shilixia 1a9849c783 xiugai 2020-07-03 09:34:18 +08:00
shilixia b62e786237 pull guize 2020-07-03 09:31:56 +08:00
caoqianming 8cfa767c56 permission_data加入性能优化 2020-07-02 12:17:28 +08:00