Merge branch 'master' of D:\workspace\ztqt with conflicts.

lyfO_o

2022-04-07 cb2e79e8374725da81b19c518405f1b91c86e601

 config/dev.env.js

@@ -16,10 +16,12 @@
  // IMG_API: '"https://sinanoaq.com:8100/upload/"',
  //   BASE_API: '"http://220.171.99.118:4100"',
  //   IMG_API: '"http://220.171.99.118:4100/upload/"',
  //     BASE_API: '"http://192.168.0.35:8006"',
  //     IMG_API: '"http://192.168.0.35:8006/upload/"',
    BASE_API: '"http://222.92.213.21:8006/zhongtai"',
    IMG_API: '"http://222.92.213.21:8006/zhongtai/upload/"',
      BASE_API: '"http://192.168.0.35:8006"',
      IMG_API: '"http://192.168.0.35:8006/upload/"',


  //   BASE_API: '"http://222.92.213.21:8006/zhongtai"',
  //   IMG_API: '"http://222.92.213.21:8006/zhongtai/upload/"',
    // BASE_API: '"http://220.171.99.118:4101/api"',
    // IMG_API: '"http://220.171.99.118:4101/api/upload/"',
};