Commit Graph

4 Commits

Author SHA1 Message Date
9808821b70 Merge branch 'ldeyun' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp into ldeyun
# Conflicts:
#	pages/views/renliziyuan/renyuanxinxi/qttongji.vue
2025-02-13 22:31:14 +08:00
1ef1384fa8 Merge branch 'master' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp
# Conflicts:
#	.env.development
#	api/renyuan.js
#	manifest.json
#	pages.json
#	pages/views/renliziyuan/renyuanxinxi/index.vue
#	pages/views/renliziyuan/renyuanxinxi/tongji.vue
2025-02-12 02:21:11 +08:00
yangzhq68909
13519318e0 删除人员台账focus 2025-01-17 18:33:30 +08:00
42adfc83d0 人员统计图表页面 2025-01-17 16:00:43 +08:00