Cronologia Commit

Autore SHA1 Messaggio Data
  huang c9c05dab26 处理合并冲突 1 mese fa
  15102826049 a42bea4b2f 销售订单和采购订单删减入库类型字段 1 mese fa
  廖泽勇 fc6f5a146a 创建订单调整 1 mese fa
  廖泽勇 73e24e6f23 Merge branch 'xq' of http://121.40.253.172:3000/pengyue/jsh_erp into master_liaozeyong 1 mese fa
  廖泽勇 562958c16f 合并冲突 1 mese fa
  廖泽勇 16be4ef8db Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into master_liaozeyong 1 mese fa
  13660505945 1c6e3ec30e Merge remote-tracking branch 'origin/master_huangjunjie' 1 mese fa
  huang 625ba54f39 商品信息导出,库存修正 1 mese fa
  13660505945 97afe4046e Merge remote-tracking branch 'origin/master_liushuang' 1 mese fa
  ms-blue b155ed55dc 对接集采商城 1 mese fa
  13660505945 51e16c3c05 [修改]项目文件存储至阿里云oss 1 mese fa
  ms-blue 20d7ac8ed2 Merge remote-tracking branch 'refs/remotes/origin/master' into master_liushuang 1 mese fa
  13660505945 54d7558b58 Merge remote-tracking branch 'origin/dev_ml' 1 mese fa
  15102826049 ee182de7f8 盘点 1 mese fa
  maliang a5f550411c feat: 提醒弹框联调 1 mese fa
  13660505945 8a2663e104 Merge remote-tracking branch 'origin/dev_ml' 1 mese fa
  maliang 1fc1084a13 fix:商品信息单位 1 mese fa
  13660505945 898b7ec659 Merge remote-tracking branch 'origin/xq' 1 mese fa
  13660505945 cd1d79b461 Merge remote-tracking branch 'origin/master_liaozeyong' 1 mese fa
  15102826049 2e8e884ac5 出入库提测 1 mese fa
  廖泽勇 026bdb3f41 Merge branch 'xq' of http://121.40.253.172:3000/pengyue/jsh_erp into master_liaozeyong 1 mese fa
  廖泽勇 506fdc7262 订单商品明细列表调整 1 mese fa
  15102826049 281e563285 出入库提测 1 mese fa
  13660505945 9547104ef9 Merge remote-tracking branch 'origin/master_liaozeyong' 1 mese fa
  13660505945 cccff700f7 Merge remote-tracking branch 'origin/master_liaozeyong' 1 mese fa
  廖泽勇 4bedbfa925 pda接口代码调整 1 mese fa
  13660505945 42e396e177 Merge remote-tracking branch 'origin/master_huangjunjie' 1 mese fa
  13660505945 22d961a116 Merge remote-tracking branch 'origin/dev_ml' 1 mese fa
  huang e6de532526 出入库新增编辑,商品选择接口 1 mese fa
  maliang 777fad717a fix:商品信息 1 mese fa