parent: 2891d9 | 补丁 | 提交对比
guoyuji
2024-01-22 94e42e483b7f6224014ef2c2179f6ab789beb93e
refs
用户 guoyuji <guoyujie@ng.com>
星期一, 一月 22, 2024 15:12 +0800
提交者 guoyuji <guoyujie@ng.com>
星期一, 一月 22, 2024 15:12 +0800
提交94e42e483b7f6224014ef2c2179f6ab789beb93e
目录 8b641cedaf993ddd24b418a558843b13dabad37b 目录 | zip | gz
parent 2891d9948252ee0f3107584b97924b8ccae1fb23 查看 | 对比
2bf272a9d41a2b6c67910b23371af9537a9153a5 查看 | 对比 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

# Conflicts:
#	north-glass-erp/.idea/dataSources.local.xml
#	north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml
#	north-glass-erp/.idea/workspace.xml
#	north-glass-erp/src/main/resources/mapper/sd/Product.xml
5个文件已添加
2个文件已修改
12个文件已删除
2460 ■■■■■ 已修改文件
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml 1808 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/information_schema.FNRwLQ.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/mysql.osA4Bg.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/performance_schema.kIw0nw.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sd_kd.B3aDBg.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sys.zb4BAA.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/testpp.Ena3yw.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/ztest.DHjtBg.meta 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/.idea/workspace.xml 472 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java 32 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java 22 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/Product.xml 26 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史