78 Commits

Author SHA1 Message Date
kun
208aadf61e fix: BUG修改 2024-04-30 17:39:31 +08:00
kun
8594c3c0a6 fix: BUG修改 2024-04-30 16:04:08 +08:00
kun
a67c9388d3 fix: BUG修改 2024-04-30 02:35:10 +08:00
kun
9d2edc6e59 fix: BUG修改 2024-04-30 00:26:49 +08:00
kun
158a2d5131 fix: BUG修改 2024-04-28 23:52:00 +08:00
kun
c5005c1fbe fix: BUG修改 2024-04-28 18:46:29 +08:00
kun
4c552391b2 fix: BUG修改 2024-04-28 15:52:10 +08:00
kun
84c4f1c92b fix: 冲突解决 2024-04-28 15:52:00 +08:00
kun
3bbe5fb998 fix: BUG修改 2024-04-28 15:49:02 +08:00
kun
0bbd4c4261 fix: BUG修改 2024-04-28 15:48:28 +08:00
kun
0d6a7749f7 fix: BUG修改 2024-04-28 15:47:49 +08:00
kun
0802e2713d fix: BUG修改 2024-04-28 15:11:20 +08:00
kun
5ae2d643a6 fix: BUG修改 2024-04-28 15:10:18 +08:00
kun
aba8cadb90 fix: BUG修改 2024-04-28 15:06:24 +08:00
kun
a8d3ffb041 fix: BUG修改 2024-04-28 09:09:41 +08:00
kun
32007d501a fix: BUG修改 2024-04-26 17:15:00 +08:00
kun
f36cfa8203 fix: BUG修改 2024-04-25 22:33:57 +08:00
kun
fb677f3719 fix: BUG修改 2024-04-24 23:29:25 +08:00
kun
30d778e524 fix: BUG修改 2024-04-24 17:53:36 +08:00
kun
8fc6ab459b fix: BUG修改 2024-04-23 22:51:24 +08:00
kun
4feafb21c9 fix: BUG修改 2024-04-23 22:51:05 +08:00
moleier
e29da3b167 修改车辆管理,接口字段还没有对完 2024-04-23 12:09:38 +08:00
moleier
03bea7613c 修复禅道上的bug 2024-04-22 23:05:07 +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
moleier
0dc27fbf49 更新工作流 2024-04-21 22:57:15 +08:00
moleier
0abcb8ef1d 工作流bug 2024-04-21 09:44:03 +08:00
moleier
0a23a58068 新增登录时选择部门,进入后可切换部门,发布流程走通 2024-04-18 16:47:31 +08:00
moleier
602b5ce7aa 添加APP工作流 2024-04-17 22:11:05 +08:00
Vce
d270658e29 fix:修改BUG 2024-04-17 10:21:53 +08:00
Vce
586e1ceefb 拉取代码 2024-04-17 09:20:58 +08:00
kun
058f531627 fix: 冲突解决以及BUG修改 2024-04-17 09:12:02 +08:00
Vce
182ba8e85c 合并分支 2024-04-17 09:03:25 +08:00
Vce
c03299bea8 Merge branch 'dev-cjw' of http://139.9.66.234:18023/dhp/zhgdyunapp into dev-cjw 2024-04-17 02:24:51 +08:00
chenjingwen
f2c05aa412 Delete __UNI__4AA4101__20231104140141.apk 2024-04-17 01:41:38 +08:00
Vce
accaf6c18b Merge branch 'dev-cjw' of http://139.9.66.234:18023/dhp/zhgdyunapp into dev-cjw 2024-04-17 00:46:44 +08:00
Vce
f4b0e5ec44 修改劳务管理计算bug 2024-04-17 00:44:17 +08:00
moleier
54f30c96a9 新增用户和供应商登录、注册、找回密码页面 2024-04-16 18:34:53 +08:00
kun
796e84e236 fix: BUG修改 2024-04-16 14:05:08 +08:00
kun
528df283c6 fix: BUG修改 2024-04-15 17:23:33 +08:00
kun
1d50edf275 fix: 解决冲突并合并代码 2024-04-15 14:36:17 +08:00
kun
11e3777c3e Merge branch 'dev-cjw' of http://139.9.66.234:18023/dhp/zhgdyunapp into dev-cjw 2024-04-15 14:22:22 +08:00
Vce
f17c36e405 修改首页tab不显示bug 2024-04-15 09:53:37 +08:00
kun
659b592e3c fix: BUG修改 2024-04-14 21:34:06 +08:00
Vce
5ffa187cf6 修改自动更新 2024-04-14 13:35:46 +08:00
Vce
b28022581d Merge branch 'dev-cjw' of http://139.9.66.234:18023/dhp/zhgdyunapp into dev-cjw 2024-03-29 17:35:42 +08:00
Vce
228f90f2b0 fix: 修改app更新Bug 2024-03-29 17:34:09 +08:00
kun
1376279bda fix: BUG修改 2024-03-15 18:51:27 +08:00
kun
6da0e9d2bf Merge branches 'yjl_dev' and 'dev-cjw' of http://139.9.66.234:18023/dhp/zhgdyunapp into dev-cjw 2024-03-13 17:25:02 +08:00
vce
06706dbd8c Fix: 修复Bug 2024-03-07 10:27:11 +08:00