Commit Graph

1310 Commits

Author SHA1 Message Date
shijing 20654838fe 0422 2022-04-22 15:34:57 +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
shijing e5ee1481de refreshToken 2022-03-31 15:18:51 +08:00
shijing e9cdb49787 yemianduobankuaiyangshixiugai 2022-03-31 11:18:29 +08:00
shijing 5d21c4e72e 1Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-30 14:44:47 +08:00
shijing 8c75eeff09 PPT修改 2022-03-30 14:44:41 +08:00
caoqianming 0b395b98cd Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-30 13:51:14 +08:00
caoqianming 707ed88b4a wproduct detail增加create_by update_by 2022-03-30 13:51:06 +08:00
caoqianming c652182358 wproduct list 增加create_by, update_by 2022-03-30 13:49:52 +08:00
shijing bca780a781 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-30 11:02:44 +08:00
shijing b288a95f3c 验证PPT1 2022-03-30 11:02:38 +08:00
caoqianming 7de173b131 操作创建人最后编辑人 2022-03-30 09:53:56 +08:00
caoqianming ac7b305d9d 生产操作取消权限过滤 2022-03-30 09:30:46 +08:00
caoqianming cfc1aaab40 process steps get * 2022-03-30 09:29:22 +08:00
caoqianming ce6af8fab4 testrecord_update put接口 2022-03-29 16:53:33 +08:00
caoqianming ab42ef0f83 srm bug 2022-03-29 11:43:27 +08:00
shijing 6a284411e6 0329 2022-03-29 09:15:14 +08:00
shijing 2ae17bdb04 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-29 09:02:18 +08:00
shijing 8b7481fb43 0329 2022-03-29 09:02:12 +08:00
caoqianming 709234e939 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-29 08:53:27 +08:00
caoqianming 8b56148949 develop增加同步数据库并重启服务 2022-03-29 08:53:19 +08:00
shijing ad16a963e4 0329 2022-03-29 08:45:12 +08:00
shijing 194b0f9731 0328 2022-03-28 09:03:38 +08:00
shijing 508803abcf coding入场检验 2022-03-25 17:00:11 +08:00
shijing 34e8573531 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-25 10:20:44 +08:00
shijing db327376fc coding261 2022-03-25 10:20:35 +08:00
caoqianming 77a081c678 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-25 09:11:54 +08:00
caoqianming 16e84bf4d0 fifoitem list 传入test [] 2022-03-25 09:11:43 +08:00
shijing 5af6787e30 coding280 2022-03-24 15:59:41 +08:00
shijing 886cba24dc 0324 2022-03-24 15:10:26 +08:00
shijing 9c9982ab06 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-03-24 14:01:32 +08:00
shijing b02dc30eb3 cording0324 2022-03-24 14:01:21 +08:00