Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/resources/templates/TravelCost/index.ftl

@@ -6,7 +6,7 @@
       <input type="text" value="${formEntity.id!}" name="createReqVO$id">
       <input type="text" value="${formEntity.bz3!}" name="createReqVO$bz3">
       <input type="text" value="${formEntity.bz2!}" name="createReqVO$bz2">
-      <input type="text" value="${formEntity.instanceId!}" name="createReqVO$travelDays">
+      <input type="text" value="${formEntity.travelDays!}" name="createReqVO$travelDays">
       <input id="subsidyDetail" type="text" value="${formEntity.subsidyDetail!}" name="createReqVO$subsidyDetail">
       <input type="text" value='${vehicleTypeJSON!}' id="vehicleTypeJSON">
       <input type="text" value='${otherTypeJSON!}' id="otherTypeJSON">

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/controller/admin/company/CompanyController.java

@@ -70,7 +70,6 @@ public class CompanyController {
 
     @GetMapping("/list-all-simple")
     @Operation(summary = "获取公司精简信息列表", description = "只包含被开启的公司，主要用于前端的下拉选项")
-    @PreAuthorize("@ss.hasPermission('system:Company:query')")
     public CommonResult<List<CompanySimpleRespVO>> getSimpleCompanyList() {
         // 获得公司列表，只要开启状态的
         CompanyListReqVO reqVO = new CompanyListReqVO();