Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

tangxiaobao

2022-04-13 e4de90990c948898db5d0c2fc080853a144728c3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngJobSetVO.java