Merge branch 'dev_cyy' into dev_realse_cyy

hongji.li

2023-09-25 d4208b18ee7c6be4b5ebb26e5e942cb24d9f8bf4

Merge branch 'dev_cyy' into dev_realse_cyy

# Conflicts:
#	_Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_ButtonERP订单_OnClick.def

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def

@@ -11,6 +11,7 @@
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: '订单新增反签/授权'
        Label: '订单新增反签/授权'
        Taborder: 1
@@ -39,6 +40,7 @@
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: '原料新增反签/授权'
        Label: '原料新增反签/授权'
        Taborder: 2
@@ -67,6 +69,7 @@
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: '加载数据（假的，后续需要对接数据）'
        Label: '加载预测订单数据'
        Taborder: 0
@@ -79,6 +82,7 @@
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: 'ERO订单冲减'
        Image: 'AMMUNITION_BOX_CLOSED'
        Label: 'ERP订单冲减'

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_List212.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listActionBarPage441.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listContextMenu182.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button593_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def

ÎļþÒÑɾ³ý