19 Commits

Author SHA1 Message Date
kun
0d6a7749f7 fix: BUG修改 2024-04-28 15:47:49 +08:00
moleier
03bea7613c 修复禅道上的bug 2024-04-22 23:05:07 +08:00
moleier
e10b86ebdd Merge branch 'yjl_dev' into bjxz-wz 2024-04-22 18:09:54 +08:00
kun
9489309f9e fix: BUG修改 2024-04-22 18:09:26 +08:00
moleier
cd2eb21f66 Merge remote-tracking branch 'origin/dev-cjw' into bjxz-wz
# Conflicts:
#	unpackage/cache/apk/__UNI__4AA4101_cm.apk
#	unpackage/cache/apk/apkurl
#	unpackage/cache/apk/cmManifestCache.json
#	unpackage/cache/certdata
#	unpackage/cache/wgt/__UNI__4AA4101/app-config-service.js
#	unpackage/cache/wgt/__UNI__4AA4101/app-service.js
#	unpackage/cache/wgt/__UNI__4AA4101/app-view.js
#	unpackage/cache/wgt/__UNI__4AA4101/manifest.json
#	unpackage/cache/wgt/__UNI__4AA4101/pages/projectEnd/laborManage/faceRecognition.js
#	unpackage/cache/wgt/__UNI__4AA4101/pages/projectEnd/project/projectInfo2.js
#	unpackage/dist/build/app-plus/app-config-service.js
#	unpackage/dist/build/app-plus/app-service.js
#	unpackage/dist/build/app-plus/app-view.js
#	unpackage/dist/build/app-plus/manifest.json
#	unpackage/dist/build/app-plus/pages/projectEnd/laborManage/faceRecognition.js
#	unpackage/dist/build/app-plus/pages/projectEnd/project/projectInfo2.js
#	unpackage/release/apk/__UNI__4AA4101__20240415200047.apk
2024-04-22 17:39:51 +08:00
moleier
5aea83d74a 修复禅道上的bug 2024-04-22 17:36:17 +08:00
Vce
bb81ad294f 修改劳务管理中查询人员的身份证号部分显示为*号 2024-04-17 09:19:16 +08:00
Vce
182ba8e85c 合并分支 2024-04-17 09:03:25 +08:00
Vce
90d04de063 修改劳务人员显示 2024-04-17 08:58:58 +08:00
Vce
f4b0e5ec44 修改劳务管理计算bug 2024-04-17 00:44:17 +08:00
kun
528df283c6 fix: BUG修改 2024-04-15 17:23:33 +08:00
cjp
545c6ebcac fix: BUG修复 2023-12-15 11:34:44 +08:00
jxj_yjl
76ecefbca6 App页面bug修复 2023-06-19 09:02:35 +08:00
yjl
b862a74075 app修改提交 2023-03-20 18:43:57 +08:00
yjl
fe2aaabf6c 修改 劳务管理-移动考勤-实时 时间显示 2023-03-15 11:51:14 +08:00
yjl
c39aeb37ea Merge branch 'yanyan_dev' of 10.0.0.60:dhp/zhgdyunapp into yjl_dev(拉取yanyan分支冲突解决) 2023-02-06 11:24:48 +08:00
yjl
ed275dc092 app历史修改提交 2023-02-06 11:14:16 +08:00
yjl
bfb98cd2aa 新增班前喊话 2022-12-09 14:54:25 +08:00
81017e2c47 Initial commit 2022-06-08 15:48:09 +08:00