parent: 1e3472 | 补丁 | 提交对比
chenlu
2024-05-11 5efb25463fb6a6825ab8c85b880815af32d37515
refs
用户 chenlu <1320612696@qq.com>
星期六, 五月 11, 2024 16:38 +0800
提交者 chenlu <1320612696@qq.com>
星期六, 五月 11, 2024 16:38 +0800
提交5efb25463fb6a6825ab8c85b880815af32d37515
目录 81d1265bcc72c6170cc75c14bf504d837d63601c 目录 | zip | gz
parent 1e34724c27ca0f5c3ab66ebb223bfc138a548e0b 查看 | 对比
05dbb19d1826ae4b888340d53b56746c1efa66cc 查看 | 对比 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
48个文件已修改
1 文件已重命名
3个文件已添加
1个文件已删除
1086 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/layout/MainErpView.vue 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/router/index.js 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/stores/userInfo.js 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/basicData/BasicData.vue 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue 25 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue 204 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue 112 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/system/user/NotPermission.vue 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/system/user/UserList.vue 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java 17 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicDataController.java 18 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java 31 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionRoleController.java 34 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicGlassType.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionBasic.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/userInfo/SysMenuItem.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/BasicGlassTypeMapper.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java 108 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeServise.java 48 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionRoleService.java 33 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/BasicGlassTypeMapper.xml 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml 56 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml 44 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/BasicGlassTypeMapper.xml 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/sd/ProductMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史