kun
|
a8d3ffb041
|
fix: BUG修改
|
2024-04-28 09:09:41 +08:00 |
|
xiaokangsix
|
c0dc4cf7c2
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev
|
2024-04-27 19:17:59 +08:00 |
|
xiaokangsix
|
a7a1af5f61
|
Merge branch 'bjxz-lk' into bjxz-dev
|
2024-04-27 19:17:23 +08:00 |
|
xiaokangsix
|
60ec364439
|
提交代码
|
2024-04-27 19:12:23 +08:00 |
|
kun
|
baccfeaa20
|
fix: 冲突解决
|
2024-04-26 22:46:22 +08:00 |
|
xiaokangsix
|
0d439c842f
|
新增模块
|
2024-04-26 22:41:50 +08:00 |
|
kun
|
ee18682dab
|
fix: 冲突解决
|
2024-04-26 18:37:04 +08:00 |
|
xiaokangsix
|
5a114f5567
|
新增代码
|
2024-04-26 18:32:13 +08:00 |
|
kun
|
e8830ec1f8
|
fix: BUG修改
|
2024-04-26 17:17:46 +08:00 |
|
kun
|
e542570881
|
fix: 冲突解决
|
2024-04-26 17:17:26 +08:00 |
|
kun
|
32007d501a
|
fix: BUG修改
|
2024-04-26 17:15:00 +08:00 |
|
xiaokangsix
|
a82e0701d7
|
新增部分模块
|
2024-04-26 17:13:29 +08:00 |
|
kun
|
1a5ec28917
|
fix: BUG修改
|
2024-04-25 23:00:34 +08:00 |
|
kun
|
cb9378c6e0
|
fix: BUG修改
|
2024-04-25 22:57:00 +08:00 |
|
xiaokangsix
|
5b04760c2f
|
更改字段
|
2024-04-25 22:53:11 +08:00 |
|
kun
|
f36cfa8203
|
fix: BUG修改
|
2024-04-25 22:33:57 +08:00 |
|
xiaokangsix
|
eec25fb144
|
更改部分逻辑，新增字段
|
2024-04-25 20:36:56 +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
|
6cd46e7d87
|
更新sn显示异常
|
2024-04-23 19:10:33 +08:00 |
|
moleier
|
20d7674bca
|
更新sn显示异常
|
2024-04-23 18:32:00 +08:00 |
|
moleier
|
570432c388
|
修改车辆管理，接口字段还没有对完
|
2024-04-23 18:23:05 +08:00 |
|
moleier
|
d85e0e77c6
|
修改车辆管理，接口字段还没有对完
|
2024-04-23 17:59:46 +08:00 |
|
moleier
|
e7d5012a2c
|
修改车辆管理，接口字段还没有对完
|
2024-04-23 17:50:47 +08:00 |
|
moleier
|
e29da3b167
|
修改车辆管理，接口字段还没有对完
|
2024-04-23 12:09:38 +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
|
9270174186
|
Merge branch 'yjl_dev' into bjxz-wz
|
2024-04-22 17:42:49 +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
|
c4fdfdfabd
|
Merge branch 'bjxz-wz' into yjl_dev
|
2024-04-21 09:52:10 +08:00 |
|
kun
|
18a7dc4759
|
fix: BUG修改
|
2024-04-21 09:50:53 +08:00 |
|
moleier
|
e1594b6262
|
Merge remote-tracking branch 'origin/yjl_dev' into bjxz-wz
|
2024-04-21 09:45:42 +08:00 |
|
moleier
|
0abcb8ef1d
|
工作流bug
|
2024-04-21 09:44:03 +08:00 |
|
kun
|
13ce4f5397
|
fix: BUG修改
|
2024-04-19 23:51:45 +08:00 |
|
moleier
|
1f096408d1
|
Merge branch 'bjxz-dev' into bjxz-wz
|
2024-04-19 09:01:27 +08:00 |
|
moleier
|
e6d44a4598
|
删除配置
|
2024-04-18 23:10:52 +08:00 |
|
kun
|
9e1b8c1ac7
|
Merge branch 'yjl_dev' into bjxz-dev
|
2024-04-18 19:54:55 +08:00 |
|
kun
|
7ffb259ce2
|
fix: BUG修改
|
2024-04-18 19:53:04 +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 |
|
Vce
|
bb81ad294f
|
修改劳务管理中查询人员的身份证号部分显示为*号
|
2024-04-17 09:19:16 +08:00 |
|
kun
|
058f531627
|
fix: 冲突解决以及BUG修改
|
2024-04-17 09:12:02 +08:00 |
|
kun
|
3984dc6163
|
fix: BUG修改
|
2024-04-17 09:08:38 +08:00 |
|