Commit Graph

1440 Commits

Author SHA1 Message Date
shijing 1986621d4c gongyingshanggongyingwuliao 2022-04-28 08:43:57 +08:00
shijing 60a27f9a21 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-27 17:14:56 +08:00
shijing 1c2f425e78 functionBrtton 2022-04-27 17:14:50 +08:00
caoqianming 6aa01443ea fifoitem 权限放开 2022-04-27 15:52:38 +08:00
caoqianming 50dda78a92 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-27 15:37:12 +08:00
caoqianming 834089f266 修改get_permission_list 2022-04-27 15:37:04 +08:00
shijing 2fb5240c9a Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-27 15:23:25 +08:00
shijing 06bb4e35aa functionBrtton 2022-04-27 15:23:17 +08:00
caoqianming 2c0d4dda32 material 增加file字段 2022-04-27 10:37:37 +08:00
caoqianming 1f3be8d689 token days 1 2022-04-27 10:18:55 +08:00
caoqianming 98b48f54b3 token 先设置为1分钟 2022-04-27 09:24:21 +08:00
caoqianming f96645ae29 到岗统计权限问题 2022-04-26 23:14:07 +08:00
caoqianming 451f50ff46 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-26 23:00:18 +08:00
caoqianming bab858f8f1 face 0.36 流程卡权限去除 2022-04-26 23:00:08 +08:00
shijing 01d41a5bf0 buttonControl 2022-04-26 15:08:16 +08:00
shijing 5aa0fed51b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-25 13:58:52 +08:00
shijing dbed58cbf6 massageBig 2022-04-25 13:58:44 +08:00
caoqianming 268b23be3a 0.42-0.38 2022-04-24 12:38:49 +08:00
shijing f9cfce58e5 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-24 09:24:18 +08:00
shijing a90cfc8077 0424 2022-04-24 09:24:06 +08:00
caoqianming 2b88abf7f6 first test_ subplan is_submited 2022-04-24 09:17:08 +08:00
caoqianming 90b75e8892 修改为0.42 2022-04-24 08:42:50 +08:00
caoqianming 1ce30de621 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-22 16:38:20 +08:00
caoqianming 5f118acb0f 0.45 bug 2022-04-22 16:38:12 +08:00
shijing 2a6e788a26 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-22 15:35:05 +08:00
shijing 20654838fe 0422 2022-04-22 15:34:57 +08:00
caoqianming f20756ec6d 前端自定义tolerance 2022-04-22 14:36:13 +08:00
caoqianming 74efc14911 renlian 0.46 2022-04-22 14:15:08 +08:00
caoqianming 3b810f83fd 人脸 0.45 2022-04-22 14:11:05 +08:00
caoqianming 71cce036a1 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-22 14:03:41 +08:00
caoqianming eac3a51c4c 匹配多张人脸情况 2022-04-22 14:03:32 +08:00
shijing c76a039bbb Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-22 13:43:32 +08:00
shijing f74be9578a 0422 2022-04-22 13:43:23 +08:00
caoqianming 6ef6fdc62f 调整容忍度 2022-04-22 11:10:32 +08:00
caoqianming e8f5002aa2 增加人脸识别登录通过文件地址 2022-04-22 09:42:34 +08:00
caoqianming 309b9f3b20 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-22 08:38:34 +08:00
caoqianming 33bc475c51 修改人脸识别容忍度 2022-04-22 08:38:24 +08:00
shijing 0a6a9ed729 0421 2022-04-21 15:23:10 +08:00
shijing 48d7ebb85c 0421 2022-04-21 14:54:43 +08:00
shijing adab213a45 0421 2022-04-21 14:11:55 +08:00
shijing 74a9b44660 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-21 14:08:34 +08:00
shijing a701296baa 0421 2022-04-21 14:08:25 +08:00
caoqianming c70702bec8 record form create update 增加 export template字段 2022-04-21 13:27:52 +08:00
caoqianming f92af5df27 增加检验记录导出功能 2022-04-21 11:32:12 +08:00
caoqianming e82e903448 hasattr(obj, employee_user) 2022-04-19 13:32:50 +08:00
caoqianming 50344dfca2 增加userstandardserializer 2022-04-19 13:27:48 +08:00
caoqianming bcf99f1515 增加自定义表模板以及表单项span字段 2022-04-19 11:10:34 +08:00
shijing 72c97071fe pageToPDF 2022-04-07 16:26:41 +08:00
shijing 0e9624281f pageHeghtAdjust 2022-04-06 16:53:58 +08:00
shijing 755c0abb35 firstExport 2022-04-06 15:04:34 +08:00