Merge branch 'score_shop' into api_score_meger

jyy

2021-08-02 578e37543a5f552a3a8b071aa637cd27e68fad33

1
2
ALTER TABLE  `bus_parameter_settings`
ADD COLUMN `shop_id` bigint(0) NULL COMMENT '门店id' AFTER `company_id`;