parent: 32cafd | 补丁 | 提交对比
chenlu
2024-03-15 e7b89d449afc3912c21a64d59bafd7737f7376fd
refs
用户 chenlu <1320612696@qq.com>
星期五, 三月 15, 2024 08:11 +0800
提交者 chenlu <1320612696@qq.com>
星期五, 三月 15, 2024 08:11 +0800
提交e7b89d449afc3912c21a64d59bafd7737f7376fd
目录 fc164dabf349ed46c24a4bed338e3bd7c8f4de96 目录 | zip | gz
parent 32cafd54c82586c749734505359d25f696ee158f 查看 | 对比
1175097e7c6a7fcb9aed0a46aad691450f898d97 查看 | 对比 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

# Conflicts:
#	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
#	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
#	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
#	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
#	north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
15个文件已修改
663 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue 142 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/pp/DamageDetails.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java 196 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml 109 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetail.xml 42 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/pp/ReportingWork.xml 109 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/pp/ReportingWorkDetail.xml 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/OrderProcessDetail.xml 42 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史