Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

hongji.li

2023-11-03 aefafd2142478d4fb07d6b8b45c3047e247389e0

 _Main/UI/MacroPlannerWebApp/Views/FillingCapacityOrder.vw

@@ -180,10 +180,10 @@
    userconfigurableinformation
    {
    }
    image: ''
    page: ''
    group: ''
    index: 14
    image: ''
    index: 0
    description: ''
  }
  formatversion: 2