Merge branch 'master' into kitchenmanage

src/pages/database/bom/index.jsx

@@ -216,6 +216,7 @@ const GoodsBomsManage = (props) => {
         actionRef={actionRef}
         pagination={{ defaultPageSize: 10 }}
         rowKey="id"
+        pagination={{ defaultPageSize: 10 }}
         toolBarRender={() => [
           <Button
             type="primary"

src/pages/device/productmanage/components/CreateForm.jsx

@@ -43,6 +43,7 @@ const CreateForm = (props) => {
         if(props?.values?.type==1){
           setdisplay("none")
           setdisanumbled('none')
+          setdisplaytxtjson('none')
         }else if(props?.values?.type==0){
           setdisplay("block")
         }